osbuild: use load function via the format module

Instead of importing the load, load_build functions into the osbuild
namespace and using it via that, use the load function via the module
that provides them, i.e. the formats.v1 module.
This commit is contained in:
Christian Kellner 2020-12-16 16:15:09 +01:00 committed by Tom Gundersen
parent b65211a94d
commit 0b6f36158d
4 changed files with 4 additions and 7 deletions

View file

@ -11,7 +11,7 @@ import sys
import tempfile
import unittest
import osbuild
from osbuild.formats import v1 as fmt
from osbuild.util import linux
@ -356,7 +356,7 @@ class OSBuild(contextlib.AbstractContextManager):
manifest_pipeline = manifest_json.get("pipeline", {})
manifest_sources = manifest_json.get("sources", {})
manifest_parsed = osbuild.load(manifest_pipeline, manifest_sources)
manifest_parsed = fmt.load(manifest_pipeline, manifest_sources)
return manifest_parsed.tree_id
@contextlib.contextmanager