Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apt-selection: order contrib before non-free* 

Components are ordered “main contrib non-free” almost everywhere, let's
use the standard order here too. There should be no functional changes.

Note: This controls the sources.list file used during the build, but
doesn't control “deb cdrom:” lines in sources.list during or after
installation, which are the result of running apt-cdrom (which sorts
components alphabetically, see its pkgCdrom::ReduceSourcelist function).
This commit is contained in:
Cyril Brulebois 2023-01-27 07:38:40 +01:00
parent ccaa1a9c69
commit 59978789f0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/apt-selection
View File

@ -45,12 +45,12 @@ options=" -q -o Dir::State::status=$APTTMP/$THIS_PKGSET/status \
-o Acquire::Languages=none" -o Acquire::Languages=none"
sections=main sections=main
if [ "${NONFREE:-0}" != "0" ] || [ "${EXTRANONFREE:-0}" != "0" ] || [ "${FORCE_FIRMWARE:-0}" != "0" ]; then
sections="$sections $NONFREE_COMPONENTS"
fi
if [ "${CONTRIB:-0}" != "0" ]; then if [ "${CONTRIB:-0}" != "0" ]; then
sections="$sections contrib" sections="$sections contrib"
fi fi
if [ "${NONFREE:-0}" != "0" ] || [ "${EXTRANONFREE:-0}" != "0" ] || [ "${FORCE_FIRMWARE:-0}" != "0" ]; then
sections="$sections $NONFREE_COMPONENTS"
fi
# Check for the necessary dirs and files ... # Check for the necessary dirs and files ...
if [ ! -d "$APTTMP/$THIS_PKGSET/apt-state/lists/partial" ]; then if [ ! -d "$APTTMP/$THIS_PKGSET/apt-state/lists/partial" ]; then