diff options
Diffstat (limited to 'sjhbuild/bundlemodule.py')
| -rw-r--r-- | sjhbuild/bundlemodule.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sjhbuild/bundlemodule.py b/sjhbuild/bundlemodule.py index 621d5a1..3f9ec0c 100644 --- a/sjhbuild/bundlemodule.py +++ b/sjhbuild/bundlemodule.py @@ -3,7 +3,7 @@ __metaclass__ = type import os from jhbuild.errors import BuildStateError -from jhbuild.modtypes import distutils, get_branch, get_dependencies, register_module_type +from jhbuild.modtypes import distutils, register_module_type __all__ = ['BundleModule'] @@ -45,19 +45,14 @@ class BundleModule(distutils.DistutilsModule): def parse_bundle(node, config, uri, repositories, default_repo): - bundle_id = node.getAttribute('id') + instance = BundleModule.parse_from_xml(node, config, uri, repositories, default_repo) # sugar.activity.bundlebuilder doesn't support --build-base (SL#2947) - supports_non_srcdir_builds = False + instance.supports_non_srcdir_builds = False if node.hasAttribute('supports-non-srcdir-builds'): - supports_non_srcdir_builds = \ + instance.supports_non_srcdir_builds = \ (node.getAttribute('supports-non-srcdir-builds') != 'no') - dependencies, after, suggests = get_dependencies(node) - branch = get_branch(node, repositories, default_repo, config) - return BundleModule(bundle_id, branch, - dependencies = dependencies, after = after, - suggests = suggests, - supports_non_srcdir_builds = supports_non_srcdir_builds) + return instance register_module_type('bundle', parse_bundle) |