summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-04-07 12:25:03 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:32 +0100
commit74030ce0a6edebc593fe72d9726271d54c08d4ae (patch)
tree684d47afbd0020c48f246b6bdcd3df92859665e2 /helpers
parent26fc30d8eb164a2d46ea31add932629398519c8e (diff)
downloadlive-build-74030ce0a6edebc593fe72d9726271d54c08d4ae.zip
live-build-74030ce0a6edebc593fe72d9726271d54c08d4ae.tar.gz
Applied patch from Erwan Le Gall <elegall@linagora.com> to give a warning when installing local packages with wrong naming scheme.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_chroot_local-packages8
1 files changed, 7 insertions, 1 deletions
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