From: Heiko Thiery <heiko.thiery@gmail.com>
To: buildroot@buildroot.org
Cc: Vincent Jardin <vjardin@free.fr>,
Heiko Thiery <heiko.thiery@gmail.com>,
Matthias Swiggers <matthias.swiggers@mind.be>,
Thomas Perale <thomas.perale@mind.be>
Subject: [Buildroot] [PATCH] utils/generate-cyclonedx: fix detecting of tty
Date: Fri, 28 Feb 2025 12:03:55 +0100 [thread overview]
Message-ID: <20250228110355.1017396-1-heiko.thiery@gmail.com> (raw)
Check if the script shall read from stdin if data is piped into.
Otherwise read from the input file or if not specified print usage and
exit.
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
---
utils/generate-cyclonedx | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/utils/generate-cyclonedx b/utils/generate-cyclonedx
index 993d7154ef..365c2b06ea 100755
--- a/utils/generate-cyclonedx
+++ b/utils/generate-cyclonedx
@@ -273,13 +273,19 @@ def main():
Example usage: make show-info | utils/generate-cyclonedx.py | jq > sbom.json
'''
)
- parser.add_argument("-i", "--in-file", nargs="?", type=argparse.FileType("r"), default=sys.stdin)
- parser.add_argument("-o", "--out-file", nargs="?", type=argparse.FileType("w"), default=sys.stdout)
+ parser.add_argument("-i", "--in-file", nargs="?", type=argparse.FileType("r"),
+ default=(None if sys.stdin.isatty() else sys.stdin))
+ parser.add_argument("-o", "--out-file", nargs="?", type=argparse.FileType("w"),
+ default=sys.stdout)
parser.add_argument("--virtual", default=False, action='store_true',
help="This option includes virtual packages to the CycloneDX output")
args = parser.parse_args()
+ if args.in_file is None:
+ parser.print_help()
+ sys.exit(1)
+
show_info_dict = json.load(args.in_file)
# Remove rootfs and virtual packages if not explicitly included
--
2.39.5
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next reply other threads:[~2025-02-28 11:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-28 11:03 Heiko Thiery [this message]
2025-02-28 13:56 ` [Buildroot] [PATCH] utils/generate-cyclonedx: fix detecting of tty Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250228110355.1017396-1-heiko.thiery@gmail.com \
--to=heiko.thiery@gmail.com \
--cc=buildroot@buildroot.org \
--cc=matthias.swiggers@mind.be \
--cc=thomas.perale@mind.be \
--cc=vjardin@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox