Merge ~mwhudson/debian-cd/+git/ubuntu:a-bit-less-hardcoding into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

[Michael Hudson-Doyle]

reduce reliance on environment variables for locating apt state

And instead read values via apt-config instead.

This is all in aid of my plan to have ubuntu-cdimage taking over the "set up apt for pool creation" stuff

[Steve Langasek (vorlon)]

review: Needs Fixing

[Michael Hudson-Doyle (mwhudson)]

Thanks, addressed comments (and rebased).

[Steve Langasek (vorlon)]

review: Approve

diff --git a/CONF.sh b/CONF.sh
index fadfb22..1b63e19 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -148,8 +148,6 @@ export OUT=$CDIMAGE_ROOT/scratch/$PROJECT/$DIST/$IMAGE_TYPE/debian-cd
 # Where we keep the temporary apt stuff.
 # This cannot reside on an NFS mount.
 export APTTMP=$CDIMAGE_ROOT/scratch/$PROJECT/$DIST/$IMAGE_TYPE/apt
-export APT_STATE=$APTTMP/$CODENAME-$FULLARCH/apt-state/
-export APT_CACHE=$APTTMP/$CODENAME-$FULLARCH/apt-cache/
 
 # Where extracted debootstrap scripts live
 export DEBOOTSTRAP=$CDIMAGE_ROOT/scratch/$PROJECT/$DIST/$IMAGE_TYPE/debootstrap
diff --git a/tools/apt-selection b/tools/apt-selection
index 7a25ee8..e373858 100755
--- a/tools/apt-selection
+++ b/tools/apt-selection
@@ -24,8 +24,10 @@ if [ -z "$FULLARCH" ]; then
 	FULLARCH="$ARCH"
 fi
 
-options=" -q -o Dir::State::status=/dev/null
-	  -o Dir::State=$APT_STATE -o Dir::Cache=$APT_CACHE \
+options=" -q -o Dir=$APTTMP/$CODENAME-$FULLARCH/ \
+	  -o Dir::State::status=/dev/null \
+	  -o Dir::State=$APTTMP/$CODENAME-$FULLARCH/apt-state/ \
+	  -o Dir::Cache=$APTTMP/$CODENAME-$FULLARCH/apt-cache/ \
 	  -o Dir::Etc=$APTTMP/$CODENAME-$FULLARCH/apt/ \
 	  -o APT::Cache::AllVersions=0 \
 	  -o APT::Architecture=$ARCH "
@@ -103,6 +105,10 @@ elif [ "$1" = "cache" ]; then
 	shift
 	apt-cache $options $@
 	exit $?
+elif [ "$1" = "config" ]; then
+	shift
+	apt-config $options $@
+	exit $?
 elif [ "$1" = "deselected" ]; then
 	shift
 	apt-get $options -s $@ > $temp
diff --git a/tools/list2src b/tools/list2src
index 6ccbe6a..af37212 100755
--- a/tools/list2src
+++ b/tools/list2src
@@ -28,7 +28,12 @@ my $bdir = "$ENV{'TDIR'}/$ENV{'CODENAME'}-$ENV{'FULLARCH'}";
 my $sdir = "$ENV{'TDIR'}/$ENV{'CODENAME'}-src";
 my $verbose = $ENV{'VERBOSE'} || 0;
 
-my $apt_lists = "$ENV{'APT_STATE'}/lists";
+my $apt = "$ENV{'BASEDIR'}/tools/apt-selection";
+
+# Appending /d to the name of the configuration item gets apt-config
+# to expand the item into a full directory path.
+my $apt_lists_cmd = `$apt config shell LISTS Dir::State::lists/d`;
+my $apt_lists = `eval $apt_lists_cmd; echo \$LISTS`;
 my $mirror = $ENV{'MIRROR'};
 my $codename = $ENV{'CODENAME'};
 
diff --git a/tools/scanpackages b/tools/scanpackages
index 9fed6ac..84c25d3 100755
--- a/tools/scanpackages
+++ b/tools/scanpackages
@@ -50,18 +50,24 @@ if [ "$1" = "install" ]; then
 
 $BASEDIR/tools/apt-selection update
 
-if [ -e $APT_STATE/lists/*_dists_${CODENAME}_InRelease ]; then
+# Appending /d to the name of the configuration item gets apt-config
+# to expand the item into a full directory path.
+eval "$($BASEDIR/tools/apt-selection config shell APT_LISTS_DIR Dir::state::lists/d)"
+
+IN_RELEASE=$APT_LISTS_DIR/*_dists_${CODENAME}_InRelease
+
+if [ -e $IN_RELEASE ]; then
     # Strip the MD5Sum, SHA1, and SHA256 fields
     # Update some other information as well
-    gpg --verify --output - $APT_STATE/lists/*_dists_${CODENAME}_InRelease 2>/dev/null | \
+    gpg --verify --output - $IN_RELEASE 2>/dev/null | \
     sed -e "s/^Architectures: .*$/Architectures: $ALL_ARCHES/" | \
     sed -e "s|^Components: .*$|Components: $COMPONENTS|" | \
-    perl -ne 'if (/^(MD5Sum|SHA1|SHA256):/i) { $f=1; next } 
-    if ($f) { 
+    perl -ne 'if (/^(MD5Sum|SHA1|SHA256):/i) { $f=1; next }
+    if ($f) {
 	unless (/^ /) { print; $f=0 }
     } else { print }' > dists/$CODENAME/Release
 else
-    echo "ERROR: Release file ($MIRROR/dists/$CODENAME/Release) is missing !"
+    echo "ERROR: Release file ($IN_RELEASE) is missing !"
     exit 1
 fi
 
@@ -108,11 +114,17 @@ for SECT in $SECTIONS; do
 	done
     done
 done
+
+# Appending /d to the name of the configuration item gets apt-config
+# to expand the item into a full directory path.
+eval "$($BASEDIR/tools/apt-selection config shell APT_DIR Dir/d)"
+mkdir -p $APT_DIR/apt-ftparchive-db
+
 # Creating the config files
 cat >$PREFIX.generate-binary <<EOF
 Dir::ArchiveDir "$2";
 Dir::OverrideDir "$BDIR/indices";
-Dir::CacheDir "$APTTMP/$CODENAME-$FULLARCH/apt-ftparchive-db";
+Dir::CacheDir "$APT_DIR/apt-ftparchive-db";
 
 TreeDefault::Contents " ";
 
diff --git a/tools/scansources b/tools/scansources
index 6a84317..f0fc703 100755
--- a/tools/scansources
+++ b/tools/scansources
@@ -47,13 +47,17 @@ done
 
 $BASEDIR/tools/apt-selection update
 
-if [ -e $APT_STATE/lists/*_dists_${CODENAME}_InRelease ]; then
+eval "$($BASEDIR/tools/apt-selection config shell APT_LISTS_DIR Dir::state::lists/d)"
+
+IN_RELEASE=$APT_LISTS_DIR/*_dists_${CODENAME}_InRelease
+
+if [ -e $IN_RELEASE ]; then
     # Strip the MD5Sum, SHA1, and SHA256 fields
+    gpg --verify --output - $IN_RELEASE 2>/dev/null | \
     perl -ne 'if (/^(MD5Sum|SHA1|SHA256):/) { $f=1; next; }
-    if ($f) { 
-	unless (/^ /) { print; $f=0 } 
-    } else { print }' \
-    $APT_STATE/lists/*_dists_${CODENAME}_InRelease | \
+    if ($f) {
+	unless (/^ /) { print; $f=0 }
+    } else { print }' | \
     sed -e "s|^Codename: .*$|Codename: $CODENAME|" \
     > dists/$CODENAME/Release
 fi
@@ -71,11 +75,14 @@ for SECT in $SECTIONS; do
     done
 done
 
+eval "$($BASEDIR/tools/apt-selection config shell APT_DIR Dir/d)"
+mkdir -p $APT_DIR/apt-ftparchive-db
+
 # Creating the config files
 cat >$PREFIX.generate-source <<EOF
 Dir::ArchiveDir "$1";
 Dir::OverrideDir "$SDIR/indices";
-Dir::CacheDir "$APTTMP/$CODENAME-$FULLARCH/apt-ftparchive-db";
+Dir::CacheDir "$APT_DIR/apt-ftparchive-db";
 
 TreeDefault::Contents " ";