[SCM] debian-live/live-helper branch, master, updated. 1.0_a27-1-27-gcc4e22a

[Daniel Baumann]

The branch, master has been updated
       via  cc4e22a27a2037abf3c67afb119166b02b0dc30b (commit)
      from  8675c2a904db652e9bf5e1129102d4e704c11e96 (commit)


- Shortlog ------------------------------------------------------------
cc4e22a helpers/lh_binary_debian-installer

Summary of changes:
 helpers/lh_binary_debian-installer |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit cc4e22a27a2037abf3c67afb119166b02b0dc30b
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Sep 15 10:45:17 2007 +0200

    helpers/lh_binary_debian-installer
    
      * Making local udebs/local debs architecture aware.

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index eeb3ea5..7145043 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -256,9 +256,9 @@ else
 fi
 
 # Including local debs
-if ls ../config/binary_local-debs/* > /dev/null 2>&1
+if ls ../config/binary_local-debs/*.deb > /dev/null 2>&1
 then
-	for FILE in ../config/binary_local-debs/*.deb
+	for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb ../config/binary_local-debs/*_all.deb
 	do
 		SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
 
@@ -325,9 +325,9 @@ mkdir -p ../cache/packages_debian-installer.udeb
 cp *.udeb ../cache/packages_debian-installer.udeb
 
 # Including local udebs
-if ls ../config/binary_local-udebs/* > /dev/null 2>&1
+if ls ../config/binary_local-udebs/*.udeb > /dev/null 2>&1
 then
-	for FILE in ../config/binary_local-udebs/*.udeb
+	for FILE in ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb ../config/binary_local-udebs/*_all.udeb
 	do
 		SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
 

-- 
debian-live/live-helper