[SCM] debian-live/live-helper branch, master, updated. 1.0_a41-1-10-g2e25016

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 2e25016815be332435b34c086386d07ecff51d3e
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Apr 7 12:25:03 2008 +0200

    Applied patch from Erwan Le Gall <elegall at linagora.com> to give a warning when installing local packages with wrong naming scheme.

diff --git a/docs/CREDITS b/docs/CREDITS
index a38aaef..1980119 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -9,6 +9,7 @@ Patches (alphabetical order):
   * Chris Lamb <chris at chris-lamb.co.uk>
   * Cyril Brulebois <cyril.brulebois at kerlabs.com>
   * David Madore <david.madore at ens.fr>
+  * Erwan Le Gall <elegall at linagora.com>
   * Fathi Boudra <fabo at debian.org>
   * Franklin Piat <fpiat at bigfoot.com>
   * Frederic Lehobey <Frederic.Lehobey at free.fr>
diff --git a/helpers/lh_chroot_local-packages b/helpers/lh_chroot_local-packages
index 484168c..953bef7 100755
--- a/helpers/lh_chroot_local-packages
+++ b/helpers/lh_chroot_local-packages
@@ -60,7 +60,13 @@ then
 
 	# Installing packages
         Chroot "find /root -name *.deb" > chroot/root/local-packages
-	Chroot "xargs --arg-file=/root/local-packages dpkg -i" || true
+
+	if [ -s chroot/root/local-packages ]
+	then
+		Chroot "xargs --arg-file=/root/local-packages dpkg -i" || true
+	else
+		Echo_warning "Local packages must be named with suffix '_all.deb' or '_\$architecture.deb'."
+	fi
 
 	# Cleaning dependencies
 	Apt install -f

-- 
debian-live/live-helper