Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-18 14:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: return 0 instead of return if the intent is not to exit build

Browse Source 
If the previous if statement checking if PASSES_TO_LAYERS is true,
then the last return code be non-zero and a return statement with no
argument will return the error code of the if statement thus exiting
the script. This is  not our intent. So we need to return 0 here when
layer name as already been registered
This commit is contained in:
Philip Roche 2024-01-24 17:58:46 +00:00
parent e1ab57301f
commit 200bde50cc
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (24.04.21) noble; urgency=medium
* Do not exit live image build if PASSES_TO_LAYERS is true and layer
is already registered.
-- Philip Roche <phil.roche@canonical.com> Wed, 24 Jan 2024 17:59:06 +0000
livecd-rootfs (24.04.20) noble; urgency=medium livecd-rootfs (24.04.20) noble; urgency=medium
* fix: Fix for calling unminimize if lxd-installer package * fix: Fix for calling unminimize if lxd-installer package

8
live-build/auto/config
View File

@ -109,7 +109,13 @@ _register_pass () {
case "$PASSES" in case "$PASSES" in
*$1*) *$1*)
return # The pass is already registered in the list of layers.
# If PASSES_TO_LAYERS is true, then the above if statement's error
# code will be non-zero and a return statement with no argument
# will return the error code of the if statement, non-zero, thus
# exiting the script and build. This is not our intent. So we need
# to return 0 here.
return 0
;; ;;
esac esac