[SCM] debian-live branch, master, updated. 1.0_a47-1-8-g51670fa
Chris Lamb
chris at chris-lamb.co.uk
Fri Jun 13 13:32:33 UTC 2008
The following commit has been merged in the master branch:
commit 51670fa564778816ca9679b01d537d2a24184abc
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Fri Jun 13 14:28:27 2008 +0100
Fix a few bogus guards in lh_binary_debian-installer
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 17793fc..1fb9114 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -301,7 +301,7 @@ then
fi
# Including local debs
- if ls ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".udeb > /dev/null 2>&1
+ if ls ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb > /dev/null 2>&1
then
for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
do
@@ -309,7 +309,7 @@ then
done
fi
- if ls ../config/binary_local-debs/*_all.udeb > /dev/null 2>&1
+ if ls ../config/binary_local-debs/*_all.deb > /dev/null 2>&1
then
for FILE in ../config/binary_local-debs/*_all.deb
do
@@ -452,7 +452,7 @@ then
fi
# Including preseeding files
- if [ -e config/binary_debian-installer/preseed*.cfg ]
+ if ls config/binary_debian_installer/preseed*.cfg > /dev/null 2>&1
then
cp config/binary_debian-installer/preseed*.cfg binary/install
fi
--
debian-live
More information about the debian-live-changes
mailing list