diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2016-11-28 16:18:09 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2016-11-28 20:58:19 +0100 |
| commit | b8f55caa144ae4761e6c69d577a0cd33bfec4961 (patch) | |
| tree | c277bb402ea796fc4f0c30642069613106e30c45 | |
| parent | db1bc0a1b87624f4326c0d1b1fd5864b23dd8f27 (diff) | |
| download | vyos-live-build-b8f55caa144ae4761e6c69d577a0cd33bfec4961.tar.gz vyos-live-build-b8f55caa144ae4761e6c69d577a0cd33bfec4961.zip | |
Fix behaviour of (undocumented) "#nif" conditional test
Thanks to Erik Cumps <erik.cumps@esaturnus.com> for the patch.
Closes: #801379
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | functions/packagelists.sh | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index e09265298..6f9f19936 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ live-build (1:20160105) UNRELEASED; urgency=medium * Drop debian/source/{local-options,options} as they are no longer needed. * Pass components to debootstrap --second-stage. Closes: #806782 Thanks to Sjoerd Simons <sjoerd.simons@collabora.co.uk> for the patch. + * Fix behaviour of (undocumented) "#nif" conditional test. Closes: #801379 + Thanks to Erik Cumps <erik.cumps@esaturnus.com> for the patch. [ Kristian Klausen ] * Include ext{3,4} journal size when calculating image size. Closes: #801712 diff --git a/functions/packagelists.sh b/functions/packagelists.sh index 0ee13ce71..444cf07d5 100755 --- a/functions/packagelists.sh +++ b/functions/packagelists.sh @@ -89,14 +89,14 @@ Expand_packagelist () _LB_NEEDLE="$(echo "${_LB_LINE}" | cut -d' ' -f3-)" _LB_HAYSTACK="$(eval "echo \$LB_$(echo "${_LB_LINE}" | cut -d' ' -f2)")" - _LB_ENABLED=0 + _LB_ENABLED=1 for _LB_NEEDLE_PART in ${_LB_NEEDLE} do for _LB_HAYSTACK_PART in ${_LB_HAYSTACK} do - if [ "${_LB_NEEDLE_PART}" != "${_LB_HAYSTACK_PART}" ] + if [ "${_LB_NEEDLE_PART}" = "${_LB_HAYSTACK_PART}" ] then - _LB_ENABLED=1 + _LB_ENABLED=0 fi done done |