pbuilder-dist: more fixes (thanks to Adrien Cunin), accept 'upgrade' as an alias for 'update', comment out not used stuff (authenticacion method detection), etc.

debian/changelog

@@ -23,8 +23,12 @@ ubuntu-dev-tools (0.27) UNRELEASED; urgency=low
   * pbuilder-dist:
      - Apply patch from James Westby to fix a problem where it always
        wanted to get the architecture to use as an option (LP: #194633).
+     - Fix a recently introduced problem where pbuilder-dist would always
+       want to know the architecture. Thanks to Adrien Cunin for finding
+       where the problem was!
      - Escape many variables to avoid possible problems there.
      - Reorganize the code a bit and comment it.
+     - Accept "upgrade" as an alias for "update".
   * 404main:
      - Filter out entries from Debian, thanks to Adrien Cunin! (LP: #194704)
   * debian/copyright.

pbuilder-dist

@@ -6,8 +6,8 @@
 #
 # License: GPLv2 or later
 #
-# This script is a wrapper to be able to easily use pbuilder with
+# This script is a wrapper to be able to easily use pbuilder for
-# differentd istributions (eg, Gutsy, Hardy, Debian unstable, etc).
+# different distributions (eg, Gutsy, Hardy, Debian unstable, etc).
 #
 # You can create symlinks to a pbuilder-dist executable to get different
 # configurations. For example, a symlink called pbuilder-hardy will assume
@@ -68,7 +68,6 @@ then
 else
 	ORIGINAL_NAME=1
 	DISTRIBUTION=$1
-	ARCHITECTURE=$REALARCH
 	shift 1
 fi
 
@@ -84,6 +83,12 @@ then
 	shift 1
 fi
 
+# If architecture hasn't been set yet, use the system's one.
+if [ -z "$ARCHITECTURE" ]
+then
+	ARCHITECTURE=$REALARCH
+fi
+
 # Check if there's a component modifier
 if [ "$1" = 'mainonly' ]; then
     EXTRACOMP=0
@@ -189,19 +194,34 @@ case $DISTRIBUTION in
         ;;
 esac
 
-# Check if the selected operation is correct
+# Save the selected operation in a variable.
 OPERATION=$1
+shift 1
+
+# Check if the selected operation is an alias for another one.
+case "$OPERATION" in
+	upgrade)
+		OPERATION=update
+		;;
+esac
+
+# Check if the selected operation is correct, or if it is an alias for
+# another one.
 case "$OPERATION" in
     create|update|build|clean|login|execute)
-        shift 1
+    	# Allright.
         ;;
     
+    upgrade)
+    	OPERATION=update
+    	;;
+    
     *)
     	if [ ${OPERATION##*.} =  'dsc' ]
     	then
     		OPERATION=build
     	else
-        	echo "Unrecognized argument. Please use one of those:"
+        	echo "Unrecognized argument '$OPERATION'. Please use one of those:"
         	echo "    create"
         	echo "    update"
         	echo "    build"
@@ -213,6 +233,8 @@ case "$OPERATION" in
         ;;
 esac
 
+# Determine the base name for the chroot tarball and the folder where the
+# resulting files will be stored.
 FOLDERBASE="${DISTRIBUTION}-$ARCHITECTURE"
 
 # Create the folder where the resulting files will be placed (if the
@@ -228,6 +250,8 @@ then
 		DEBCACHE='/var/cache/apt/archives/'
 fi
 
+# If it's an Ubuntu system, create an editable configuration file,
+# and if it's a stable release add the -security and -updates repositories.
 if [ $ISDEBIAN = "False" ]
 then
 	if [ ! -d $BASE_DIR/etc/$DISTRIBUTION/apt.conf/ ]
@@ -250,27 +274,27 @@ EOF
 	fi
 fi
 
-if [ -z "$PBUILDAUTH" ]
+#if [ -z "$PBUILDAUTH" ]
-then
+#then
-	if [ -n "$DESKTOP_SESSION"  ]
+#	if [ -n "$DESKTOP_SESSION"  ]
-	then
+#	then
-		case $DESKTOP_SESSION in 
+#		case $DESKTOP_SESSION in 
-			gnome )
+#			gnome )
-				SUDOREPLACE="gksudo -D \"Pbuilder\" "
+#				SUDOREPLACE="gksudo -D \"Pbuilder\""
-				;;
+#				;;
-			kde|kde4 )
+#			kde|kde4 )
-				SUDOREPLACE="kdesudo -d --comment \"Pbuilder\""
+#				SUDOREPLACE="kdesudo -d --comment \"Pbuilder\""
-				;;
+#				;;
-			* )
+#			* )
-				SUDOREPLACE="sudo"
+#				SUDOREPLACE="sudo"
-				;;
+#				;;
-		esac
+#		esac
-	else
+#	else
-		SUDOREPLACE=sudo
+#		SUDOREPLACE=sudo
-	fi
+#	fi
-else
+#else
-	SUDOREPLACE=$PBUILDAUTH
+#	SUDOREPLACE=$PBUILDAUTH
-fi
+#fi
 
 sudo pbuilder $OPERATION \
 --basetgz "$BASE_DIR/${FOLDERBASE}-base.tgz" \
@@ -282,5 +306,5 @@ $( [ -z "$PROXY" ] || echo "--http-proxy ${PROXY}" ) \
 $( [ -z "$DEBCACHE" ] || echo "--aptcache ${DEBCACHE}" ) \
 --buildresult "${BASE_DIR}/${FOLDERBASE}_result" \
 --mirror "${ARCHIVE}" \
---aptconfdir "${BASE_DIR}/etc/${DISTRIBUTION}/apt.conf/" \
+$( [ $ISDEBIAN != "False" ] || echo "--aptconfdir \"${BASE_DIR}/etc/${DISTRIBUTION}/apt.conf/\"" ) \
 $@