diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2014-12-10 15:58:34 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2016-01-05 18:05:12 +0100 |
| commit | 4d67c64ba2774c63b8a30d8cfe49ae9a47be3647 (patch) | |
| tree | 4cf35313a92d90acb344477912f2bf0e66e51f86 | |
| parent | b8eb3ab14401612e52cc6729387407c2e8b5a6b5 (diff) | |
| download | vyos-live-build-4d67c64ba2774c63b8a30d8cfe49ae9a47be3647.tar.gz vyos-live-build-4d67c64ba2774c63b8a30d8cfe49ae9a47be3647.zip | |
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
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | scripts/build/binary_package-lists | 4 |
2 files changed, 10 insertions, 0 deletions
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 <hertzog@debian.org> 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} |