reproducible Debian: refactoring

Signed-off-by: Holger Levsen <holger@layer-acht.org>

bin/reproducible_debstrap.sh

@@ -27,6 +27,16 @@ cleanup() {
 	fi
 }
 
+cleanup_unreproducible_file(){
+	TYPE=$1
+	FILE=$2
+	if [ -f $FILE ] ; then
+		output_echo "Warning: modifying $TOOL result, deleting $TYPE $FILE"
+		sudo rm -rf --one-file-system $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}/$FILE
+	else
+		output_echo "Warning: shall remove $FILE but it does not exist. Maybe $TOOL was improved."
+	fi
+}
 
 # Init some variables
 export TOOL="$1"
@@ -66,21 +76,11 @@ for LOOP in "first" "second" ; do
 				;;
 		debootstrap|cdebootstrap)
 				sudo $REALTOOL $SUITE $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}
-				for LOGFILE in /var/log/bootstrap.log /var/log/dpkg.log /var/log/alternatives.log ; do
-					if [ -f $LOGFILE ] ; then
-						output_echo "Warning: modifying $TOOL result, deleting unreproducible logfile $LOGFILE"
-						sudo rm -rf --one-file-system $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}/$LOGFILE
-					else
-						output_echo "Warning: shall remove $LOGFILE but it does not exist. Maybe $TOOL was improved."
-					fi
+				for FILE in /var/log/bootstrap.log /var/log/dpkg.log /var/log/alternatives.log ; do
+					cleanup_unreproducible_file "unreproducible logfile" $FILE
 				done
 				for FILE in /etc/machine-id /var/cache/ldconfig/aux-cache ; do
-					if [ -f $LOGFILE ] ; then
-						output_echo "Warning: modifying $TOOL result, deleting unreproducible file $FILE because it will be created as needed"
-						sudo rm -rf --one-file-system $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}/$FILE
-					else
-						output_echo "Warning: shall remove $FILE but it does not exist. Maybe $TOOL was improved."
-					fi
+					cleanup_unreproducible_file "unreproducible file" $FILE
 				done
 				sudo tar --mtime="@$SOURCE_DATE_EPOCH" --clamp-mtime -C $BUILDDIR/$SUBDIR/${TOOL}/ -cf $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}.tar ${SUITE}
 				sudo rm -rf --one-file-system $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}