From 4d67c64ba2774c63b8a30d8cfe49ae9a47be3647 Mon Sep 17 00:00:00 2001 From: Raphaël Hertzog Date: Wed, 10 Dec 2014 15:58:34 +0100 Subject: Better handle empty package lists. The fix in a294a46fb9fe28e43686b18da7b22ec1c46b0d4f was not enough. This should finally resolve the problem when a package list ends up empty (most notably due to #if evaluating to false). Sponsored-By: Offensive Security --- debian/changelog | 6 ++++++ scripts/build/binary_package-lists | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2e568ea14..46eb681ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +live-build (1:20160105) UNRELEASED; urgency=medium + + * Better handle empty package lists. + + -- Raphaël Hertzog Tue, 05 Jan 2016 18:03:44 +0100 + live-build (1:20151215) unstable; urgency=medium * QA Upload. diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists index d81bfe7d1..dcbadccb5 100755 --- a/scripts/build/binary_package-lists +++ b/scripts/build/binary_package-lists @@ -145,6 +145,10 @@ then for SECTION in ${POOL}/* do + if [ ! -d "${SECTION}" ]; then + break # Do nothing if the package lists were empty... + fi + SECTION="$(basename ${SECTION})" mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES} -- cgit v1.2.3