particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild: use "manifest" when describing the osbuild input

Browse source 
osbuild can now take only manifests as its input (the legacy input format
was dropped in e48c2f1). This commit changes all remaining occurrences of
"pipeline" to "manifest" when describing the osbuild input.
This commit is contained in:
Ondřej Budai 2020-03-30 11:33:43 +02:00 • committed by Tom Gundersen
parent 60e3ec4add
commit 509d2ee895
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
osbuild/__main__.py
View file

@ -33,8 +33,8 @@ def mark_checkpoints(pipeline, checkpoints):
# pylint: disable=too-many-statements
def main():
parser = argparse.ArgumentParser(description="Build operating system images")
parser.add_argument("pipeline_path", metavar="PIPELINE",
help="json file containing the pipeline that should be built, or a '-' to read from stdin")
parser.add_argument("manifest_path", metavar="MANIFEST",
help="json file containing the manifest that should be built, or a '-' to read from stdin")
parser.add_argument("--build-env", metavar="FILE", type=os.path.abspath,
help="json file containing a description of the build environment")
parser.add_argument("--store", metavar="DIRECTORY", type=os.path.abspath,
@ -52,10 +52,10 @@ def main():
help="output results in JSON format")
args = parser.parse_args()
if args.pipeline_path == "-":
if args.manifest_path == "-":
f = sys.stdin
else:
f = open(args.pipeline_path)
f = open(args.manifest_path)
manifest = json.load(f)
f.close()