add support for APTCONF in /etc/eterbuild

etersoft-build-utils/bin/rpmunmets

@@ -75,7 +75,7 @@ TESTINGAPTCONF=$OURTMPDIR/apt.conf
 
 # Hack: subst patch to sources.list
 cat $ORDINALAPTCONF | \
-	sed -e "s|\"/etc/apt/.*\"|\"$OURTMPDIR/sources.list\"|g" >$TESTINGAPTCONF
+	sed -e "s|\"/etc/.*apt/sources.*\"|\"$OURTMPDIR/sources.list\"|g" >$TESTINGAPTCONF
 cat $ETERBUILDETC/apt/sources.list.$MENV >$OURTMPDIR/sources.list || fatal ""
 
 HASHERDIR=$HASHERDIR$MENVARG

etersoft-build-utils/share/eterbuild/functions/config

@@ -32,7 +32,10 @@ is_git()
 }
 
 RPMDIR="$HOME/RPM"
-[ -n "$APTCONF" ] || APTCONF=$ETERBUILDETC/apt/apt.conf
+
+# apt.conf.SS is exists by default
+[ -n "$APTCONF" ] || APTCONF=$ETERBUILDETC/apt/apt.conf.SS
+
 #OWNERMAIL=`grep "^%packager" ~/.rpmmacros | head -n 1 | sed -e "s/%packager[ \t]*//g"`
 OWNERMAIL=`rpm --eval %packager`
 

etersoft-build-utils/share/eterbuild/functions/hasher

@@ -21,3 +21,11 @@ check_locking()
 	fi
 }
 
+# workaround about hard coded path to source.list in apt.conf
+print_tmp_aptconf()
+{
+	test -r "$1" || fatal "$1 is missed"
+	# Note: /etc/apt and /etc/eterbuild/apt is supported
+	cat "$1" | \
+		sed -e "s|\"/etc/.*apt/sources.list|\"$ETERBUILDETC/apt/sources.list|g"
+}

etersoft-build-utils/tests/test_aptconf.sh

+#!/bin/sh
+
+. `dirname $0`/../share/eterbuild/functions/common
+. $ETERBUILDDIR/functions/hasher
+
+print_tmp_aptconf $APTCONF
+echo "-------------------------------"
+print_tmp_aptconf /etc/apt/apt.conf.SS