[SCM] live-build branch, debian-next, updated. debian/2.0_a29-1-2-gdda807e

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit dda807e374eb9937646e001d595ad395cca1beff
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Sep 17 00:47:25 2010 +0200

    Making rmdir calls on cleanups more robust.

diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean
index e5ae3df..f0e43a5 100755
--- a/scripts/build/lb_clean
+++ b/scripts/build/lb_clean
@@ -62,10 +62,7 @@ do
 			LH=1 "${0}" noauto --stage
 			LH=1 "${0}" noauto --source
 
-			if [ -d auto ]
-			then
-				rmdir --ignore-fail-on-non-empty auto
-			fi
+			rmdir --ignore-fail-on-non-empty auto > /dev/null 2>&1 || true
 			;;
 
 		--cache)
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index d91aea1..ee12c32 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1370,30 +1370,11 @@ 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/scripts ]
-	then
-		rmdir --ignore-fail-on-non-empty auto/scripts
-	fi
-
-	if [ -d auto ]
-	then
-		rmdir --ignore-fail-on-non-empty auto
-	fi
+	rmdir --ignore-fail-on-non-empty config/*/ > /dev/null 2>&1 || true
+	rmdir --ignore-fail-on-non-empty config > /dev/null 2>&1 || true
+	rmdir --ignore-fail-on-non-empty auto/functions > /dev/null 2>&1 || true
+	rmdir --ignore-fail-on-non-empty auto/scripts > /dev/null 2>&1 || true
+	rmdir --ignore-fail-on-non-empty auto > /dev/null 2>&1 || true
 fi
 
 # Creating stage file

-- 
live-build