From 74030ce0a6edebc593fe72d9726271d54c08d4ae Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Mon, 7 Apr 2008 12:25:03 +0200
Subject: Applied patch from Erwan Le Gall <elegall@linagora.com> to give a
warning when installing local packages with wrong naming scheme.
---
docs/CREDITS | 1 +
helpers/lh_chroot_local-packages | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
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@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 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
--
cgit v1.0