summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/CREDITS1
-rwxr-xr-xhelpers/lh_chroot_local-packages8
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/CREDITS b/docs/CREDITS
index a38aaefd2..19801193b 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -9,6 +9,7 @@ Patches (alphabetical order):
* Chris Lamb <chris@chris-lamb.co.uk>
* Cyril Brulebois <cyril.brulebois@kerlabs.com>
* David Madore <david.madore@ens.fr>
+ * Erwan Le Gall <elegall@linagora.com>
* Fathi Boudra <fabo@debian.org>
* Franklin Piat <fpiat@bigfoot.com>
* Frederic Lehobey <Frederic.Lehobey@free.fr>
diff --git a/helpers/lh_chroot_local-packages b/helpers/lh_chroot_local-packages
index 484168c4f..953bef784 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