From 926a6a56a2c95dbc6879df824e49e1b024bb423d Mon Sep 17 00:00:00 2001 From: David Rheinsberg Date: Thu, 26 Mar 2020 19:00:30 +0100 Subject: [PATCH] osbuild: drop legacy input format This drops support for passing in non-manifest style pipelines directly. It used to be that we directly pass in the pipeline description, but it got changed to a proper manifest format in: commit e48c2f178cb047d3872ea494206788072f13594d Author: Tom Gundersen Date: Thu Feb 13 17:44:54 2020 +0100 osbuild: allow the sources to be passed in on stdin With 2 releases in between, we are now far enough to drop the old format. All code has been converted, our API guarantee is not in place, yet, so lets just drop the legacy code and fully commit to the manifest. Fixes #265. --- osbuild/__main__.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/osbuild/__main__.py b/osbuild/__main__.py index f9cba16f..4b5f3119 100755 --- a/osbuild/__main__.py +++ b/osbuild/__main__.py @@ -59,13 +59,8 @@ def main(): manifest = json.load(f) f.close() - if "pipeline" in manifest: - pipeline = manifest["pipeline"] - sources_options = manifest.get("sources", {}) - else: - # backwards compatibility - pipeline = manifest - sources_options = {} + pipeline = manifest.get("pipeline", {}) + sources_options = manifest.get("sources", {}) if args.sources: with open(args.sources) as f: