[SCM] live-build branch, debian-next, updated. debian/2.0_a26-1-4-gc46256f

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit c46256fe665ae60945a8fe7f1a10d217bcfc1819
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Sep 7 16:25:58 2010 +0200

    Correcting --clean handling in lb_config.

diff --git a/scripts/build/config b/scripts/build/config
index 38ae64e..3cf4a6d 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -204,28 +204,8 @@ Local_arguments ()
 				;;
 
 			--clean)
-				# Remove empty directories in config tree
-				if ls config/*/ > /dev/null 2>&1
-				then
-					rmdir --ignore-fail-on-non-empty config/*/
-				fi
-
-				if [ -d config ]
-				then
-					rmdir --ignore-fail-on-non-empty config
-				fi
-
-				if [ -d auto/functions ]
-				then
-					rmdir --ignore-fail-on-non-empty auto/functions
-				fi
-
-				if [ -d auto ]
-				then
-					rmdir --ignore-fail-on-non-empty auto
-				fi
-
-				exit 0
+				_CLEAN="true"
+				shift
 				;;
 
 			# config/common
@@ -1355,5 +1335,29 @@ fi
 # Checking defaults again
 Check_defaults
 
+if [ "${_CLEAN}" = "true" ]
+then
+	# Remove empty directories in config tree
+	if ls config/*/ > /dev/null 2>&1
+	then
+		rmdir --ignore-fail-on-non-empty config/*/
+	fi
+
+	if [ -d config ]
+	then
+		rmdir --ignore-fail-on-non-empty config
+	fi
+
+	if [ -d auto/functions ]
+	then
+		rmdir --ignore-fail-on-non-empty auto/functions
+	fi
+
+	if [ -d auto ]
+	then
+		rmdir --ignore-fail-on-non-empty auto
+	fi
+fi
+
 # Creating stage file
 Create_stagefile .stage/config

-- 
live-build