Message ID | 20240610100255.47239-1-amikan@ilbers.de |
---|---|
State | Accepted, archived |
Headers | show |
Series | scripts: Do not used set in sourced script | expand |
On Mon, 2024-06-10 at 13:02 +0300, Anton Mikanovich wrote: > Adding 'set -e' in the sourcing script makes it apply on running > console/chroot. This results in closing current console/chroot in > case > of Isar build failure. > Partly revert 4f9b6419 removing this case for isar-buildenv-internal. > > Signed-off-by: Anton Mikanovich <amikan@ilbers.de> > --- > scripts/isar-buildenv-internal | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/scripts/isar-buildenv-internal b/scripts/isar-buildenv- > internal > index 817387cf..bf8c3387 100755 > --- a/scripts/isar-buildenv-internal > +++ b/scripts/isar-buildenv-internal > @@ -21,8 +21,6 @@ > > # It is assumed ISARROOT is already defined when this is called > > -set -e > - > if [ -z "$ISARROOT" ]; then > echo >&2 "Error: ISARROOT is not defined!" > return 1 > -- > 2.34.1 > Applied to next.
diff --git a/scripts/isar-buildenv-internal b/scripts/isar-buildenv-internal index 817387cf..bf8c3387 100755 --- a/scripts/isar-buildenv-internal +++ b/scripts/isar-buildenv-internal @@ -21,8 +21,6 @@ # It is assumed ISARROOT is already defined when this is called -set -e - if [ -z "$ISARROOT" ]; then echo >&2 "Error: ISARROOT is not defined!" return 1
Adding 'set -e' in the sourcing script makes it apply on running console/chroot. This results in closing current console/chroot in case of Isar build failure. Partly revert 4f9b6419 removing this case for isar-buildenv-internal. Signed-off-by: Anton Mikanovich <amikan@ilbers.de> --- scripts/isar-buildenv-internal | 2 -- 1 file changed, 2 deletions(-)