manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly support empty package lists. 

The user might not have created any package list or it might have
created a packages list that end up being empty due to various #if tests.
We should not fail in those cases.
This commit is contained in:
Raphaël Hertzog 2014-12-05 09:53:13 +01:00 committed by Daniel Baumann
parent 571c89447b
commit a294a46fb9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/build/binary_package-lists
View File

@ -101,7 +101,7 @@ then
Expand_packagelist "${LIST}" "config/package-lists" > chroot/root/"$(basename ${LIST})"
# Downloading additional packages
Chroot chroot "xargs --arg-file=/root/$(basename ${LIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"
Chroot chroot "xargs --no-run-if-empty --arg-file=/root/$(basename ${LIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"
# Remove package list
rm chroot/root/"$(basename ${LIST})"
@ -110,6 +110,10 @@ then
for FILE in chroot/binary.deb/archives/*.deb
do
if [ ! -e ${FILE} ]; then
break # Do nothing if the package lists were empty...
fi
SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
SECTION="$(dpkg -f ${FILE} Section | awk '{ print $1 }')"