From bb0283e6f9dea46366f862046818c5648c0b1e62 Mon Sep 17 00:00:00 2001 From: Lucas Caudill Date: Wed, 5 Jun 2024 16:43:57 +0000 Subject: [PATCH] more interactive shell troubles --- bin/ch-image.py.in | 2 +- test/build/50_ch-image.bats | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/ch-image.py.in b/bin/ch-image.py.in index e3a12fb19..a34f1e457 100644 --- a/bin/ch-image.py.in +++ b/bin/ch-image.py.in @@ -284,7 +284,7 @@ def main(): add_opts(sp, build.modify, deps_check=True, stog_init=True) sp.add_argument("-c", metavar="CMD", action="append", default=[], nargs=1, help="foo") sp.add_argument("-S", "--shell", metavar="shell", help="foo") - # FIXME: remove + # FIXME: rename sp.add_argument("--ci-debug", action="store_true", help="CI debugging, remove this before merge!") sp.add_argument("image_ref", metavar="IMAGE_REF", help="image to modify") sp.add_argument("out_image", metavar="OUT_IMAGE", help="destination of modified image") diff --git a/test/build/50_ch-image.bats b/test/build/50_ch-image.bats index 1355f4a5a..bec216461 100644 --- a/test/build/50_ch-image.bats +++ b/test/build/50_ch-image.bats @@ -1021,7 +1021,7 @@ EOF [[ $output = *'output must be different from source image'* ]] # non-existant shell - run ch-image modify -S "doesnotexist" -- alpine:3.17 tmpimg + run ch-image modify --ci-debug -S "doesnotexist" -- alpine:3.17 tmpimg echo "$output" [[ $status -eq 1 ]] [[ $output = *'Unable to run shell:'* ]]