[SCM] debian-live branch, master, updated. 1.0_a47-1-10-gef26b6e

Chris Lamb chris at chris-lamb.co.uk
Fri Jun 13 14:57:04 UTC 2008


The following commit has been merged in the master branch:
commit ef26b6ea783b9ea3443f7339e751bc5c0b7eaba6
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Jun 13 15:53:19 2008 +0100

    Don't skip single dot-files in the root directory of binary and chroot local includes
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_local-includes b/helpers/lh_binary_local-includes
index a12a186..04e429e 100755
--- a/helpers/lh_binary_local-includes
+++ b/helpers/lh_binary_local-includes
@@ -42,7 +42,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if ls config/binary_local-includes/* > /dev/null 2>&1
+if ls -A config/binary_local-includes/ | grep . > /dev/null 2>&1
 then
 	# Copying includes
 	cd config/binary_local-includes
diff --git a/helpers/lh_chroot_local-includes b/helpers/lh_chroot_local-includes
index 281080d..49d1c80 100755
--- a/helpers/lh_chroot_local-includes
+++ b/helpers/lh_chroot_local-includes
@@ -42,7 +42,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if ls config/chroot_local-includes/* > /dev/null 2>&1
+if ls -A config/chroot_local-includes/ | grep . > /dev/null 2>&1
 then
 	# Copying includes
 	cd config/chroot_local-includes

-- 
debian-live



More information about the debian-live-changes mailing list