[SCM] live-build branch, debian-next, updated. debian/3.0_a61-1-1-gefe7090

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit efe7090bdb45ffa9ab13d54a2c1e4dafd01f10aa
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Sep 30 15:13:42 2012 +0200

    Simplyfing clean option in lb config.

diff --git a/scripts/build/config b/scripts/build/config
index 94a1768..db87bc6 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -1492,11 +1492,10 @@ Check_defaults
 if [ "${_CLEAN}" = "true" ]
 then
 	# Remove empty directories in config tree
+	rmdir --ignore-fail-on-non-empty auto > /dev/null 2>&1 || true
 	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 > /dev/null 2>&1 || true
-	rmdir --ignore-fail-on-non-empty local/functions > /dev/null 2>&1 || true
-	rmdir --ignore-fail-on-non-empty local/scripts > /dev/null 2>&1 || true
+	rmdir --ignore-fail-on-non-empty local/*/ > /dev/null 2>&1 || true
 	rmdir --ignore-fail-on-non-empty local > /dev/null 2>&1 || true
 fi
 

-- 
live-build