osbuild: resolve TODOs
When an alternative monitor like JSONSeqMonitor is used there is still non json output printed to stdout. This was a TODO but this commit removes it because it's okay, there is the "--monitor-fd" that should be used when using the json-seq monitor.
This commit is contained in:
parent
f214c69a98
commit
66468a3c58
2 changed files with 1 additions and 4 deletions
|
|
@ -186,7 +186,6 @@ def osbuild_cli() -> int:
|
|||
debug_break,
|
||||
stage_timeout=stage_timeout
|
||||
)
|
||||
# TODO: this needs a test
|
||||
if r["success"]:
|
||||
monitor.log(f"manifest {args.manifest_path} finished successfully", origin="org.osbuild.main")
|
||||
else:
|
||||
|
|
@ -197,8 +196,6 @@ def osbuild_cli() -> int:
|
|||
for pid in exports:
|
||||
export(pid, output_directory, object_store, manifest)
|
||||
|
||||
# TODO: subpress when "--monitor=JSONSeqMontior" is used
|
||||
# or (be explcit) have "--no-summary" or something
|
||||
if args.json:
|
||||
r = fmt.output(manifest, r, object_store)
|
||||
json.dump(r, sys.stdout)
|
||||
|
|
|
|||
|
|
@ -335,7 +335,7 @@ class JSONSeqMonitor(BaseMonitor):
|
|||
|
||||
# result is for modules
|
||||
def result(self, result: osbuild.pipeline.BuildResult):
|
||||
# TODO: check pipeline id?
|
||||
# we may need to check pipeline ids here in the future
|
||||
if self._progress.sub_progress:
|
||||
self._progress.sub_progress.incr()
|
||||
self.log(f"Finished module {result.name}", origin="org.osbuild.main")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue