From 59978789f08bb694e4038b0b32261f138b9e017c Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Fri, 27 Jan 2023 07:38:40 +0100
Subject: [PATCH] apt-selection: order contrib before non-free*
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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).
---
 tools/apt-selection | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/apt-selection b/tools/apt-selection
index b4e9b1d4..daaf0b5d 100755
--- a/tools/apt-selection
+++ b/tools/apt-selection
@@ -45,12 +45,12 @@ options=" -q -o Dir::State::status=$APTTMP/$THIS_PKGSET/status \
 		  -o Acquire::Languages=none"
 
 sections=main
-if [ "${NONFREE:-0}" != "0" ] || [ "${EXTRANONFREE:-0}" != "0" ] || [ "${FORCE_FIRMWARE:-0}" != "0" ]; then
-	sections="$sections $NONFREE_COMPONENTS"
-fi
 if [ "${CONTRIB:-0}" != "0" ]; then
 	sections="$sections contrib"
 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 ...
 if [ ! -d "$APTTMP/$THIS_PKGSET/apt-state/lists/partial" ]; then