From 54c2ee8cb2ec1a07ca663d2f5d8c21563ae0e3e7 Mon Sep 17 00:00:00 2001 From: Lucas Caudill Date: Wed, 5 Jun 2024 16:28:29 +0000 Subject: [PATCH] back to how it used to work? --- bin/ch-image.py.in | 1 + lib/build.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/ch-image.py.in b/bin/ch-image.py.in index d043c17e2..e3a12fb19 100644 --- a/bin/ch-image.py.in +++ b/bin/ch-image.py.in @@ -284,6 +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 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/lib/build.py b/lib/build.py index c7d16c528..1992ee822 100644 --- a/lib/build.py +++ b/lib/build.py @@ -304,11 +304,13 @@ def modify(cli_): ch.ILLERI(cli.script) - if ((not sys.stdin.isatty()) and (commands == [])): + if ((not sys.stdin.isatty()) and (commands == []) and (not cli.ci_debug)): # https://stackoverflow.com/a/6482200 stdin = sys.stdin.read() + + # FIXME: remove if (cli.ci_debug): ch.INFO("STDIN!!!") ch.INFO(stdin)