| |
@@ -96,14 +96,14 @@
|
| |
# to the specific commit available at the time of
|
| |
# submission (now).
|
| |
pkgref = module_build_service.scm.SCM(
|
| |
- pkg.get_repository()).get_latest(pkg.get_ref())
|
| |
+ pkg.peek_repository()).get_latest(pkg.peek_ref())
|
| |
except Exception as e:
|
| |
log.exception(e)
|
| |
return {'error': "Failed to get the latest commit for %s#%s" % (
|
| |
- pkg.get_repository(), pkg.get_ref())}
|
| |
+ pkg.peek_repository(), pkg.peek_ref())}
|
| |
|
| |
return {
|
| |
- 'pkg_name': pkg.get_name(),
|
| |
+ 'pkg_name': pkg.peek_name(),
|
| |
'pkg_ref': pkgref,
|
| |
'error': None
|
| |
}
|
| |
@@ -156,30 +156,30 @@
|
| |
xmd['mbs']['rpms'] = {}
|
| |
# Add missing data in RPM components
|
| |
for pkgname, pkg in mmd.get_rpm_components().items():
|
| |
- if pkg.get_repository() and not conf.rpms_allow_repository:
|
| |
+ if pkg.peek_repository() and not conf.rpms_allow_repository:
|
| |
raise Forbidden(
|
| |
"Custom component repositories aren't allowed. "
|
| |
- "%r bears repository %r" % (pkgname, pkg.get_repository()))
|
| |
- if pkg.get_cache() and not conf.rpms_allow_cache:
|
| |
+ "%r bears repository %r" % (pkgname, pkg.peek_repository()))
|
| |
+ if pkg.peek_cache() and not conf.rpms_allow_cache:
|
| |
raise Forbidden(
|
| |
"Custom component caches aren't allowed. "
|
| |
"%r bears cache %r" % (pkgname, pkg.cache))
|
| |
- if not pkg.get_repository():
|
| |
+ if not pkg.peek_repository():
|
| |
pkg.set_repository(conf.rpms_default_repository + pkgname)
|
| |
- if not pkg.get_cache():
|
| |
+ if not pkg.peek_cache():
|
| |
pkg.set_cache(conf.rpms_default_cache + pkgname)
|
| |
- if not pkg.get_ref():
|
| |
+ if not pkg.peek_ref():
|
| |
pkg.set_ref('master')
|
| |
|
| |
# Add missing data in included modules components
|
| |
for modname, mod in mmd.get_module_components().items():
|
| |
- if mod.get_repository() and not conf.modules_allow_repository:
|
| |
+ if mod.peek_repository() and not conf.modules_allow_repository:
|
| |
raise Forbidden(
|
| |
"Custom module repositories aren't allowed. "
|
| |
- "%r bears repository %r" % (modname, mod.get_repository()))
|
| |
- if not mod.get_repository():
|
| |
+ "%r bears repository %r" % (modname, mod.peek_repository()))
|
| |
+ if not mod.peek_repository():
|
| |
mod.set_repository(conf.modules_default_repository + modname)
|
| |
- if not mod.get_ref():
|
| |
+ if not mod.peek_ref():
|
| |
mod.set_ref('master')
|
| |
|
| |
# Check that SCM URL is valid and replace potential branches in pkg refs
|
| |
@@ -207,10 +207,10 @@
|
| |
|
| |
def validate_mmd(mmd):
|
| |
for modname, mod in mmd.get_module_components().items():
|
| |
- if mod.get_repository() and not conf.modules_allow_repository:
|
| |
+ if mod.peek_repository() and not conf.modules_allow_repository:
|
| |
raise Forbidden(
|
| |
"Custom module repositories aren't allowed. "
|
| |
- "%r bears repository %r" % (modname, mod.get_repository()))
|
| |
+ "%r bears repository %r" % (modname, mod.peek_repository()))
|
| |
|
| |
|
| |
def merge_included_mmd(mmd, included_mmd):
|
| |
@@ -266,7 +266,7 @@
|
| |
return
|
| |
|
| |
rpm_weights = module_build_service.builder.GenericBuilder.get_build_weights(
|
| |
- [c.get_name() for c in rpm_components])
|
| |
+ [c.peek_name() for c in rpm_components])
|
| |
all_components.sort(key=lambda x: x.get_buildorder())
|
| |
# We do not start with batch = 0 here, because the first batch is
|
| |
# reserved for module-build-macros. First real components must be
|
| |
@@ -284,7 +284,7 @@
|
| |
# set to our current batch, so the components of this module
|
| |
# are built in the right global order.
|
| |
if isinstance(component, Modulemd.ComponentModule):
|
| |
- full_url = component.get_repository() + "?#" + component.get_ref()
|
| |
+ full_url = component.peek_repository() + "?#" + component.peek_ref()
|
| |
# It is OK to whitelist all URLs here, because the validity
|
| |
# of every URL have been already checked in format_mmd(...).
|
| |
included_mmd = _fetch_mmd(full_url, whitelist_url=True)[0]
|
| |
@@ -292,16 +292,16 @@
|
| |
previous_buildorder, main_mmd, session=session)
|
| |
continue
|
| |
|
| |
- component_ref = mmd.get_xmd()['mbs']['rpms'][component.get_name()]['ref']
|
| |
- full_url = component.get_repository() + "?#" + component_ref
|
| |
+ component_ref = mmd.get_xmd()['mbs']['rpms'][component.peek_name()]['ref']
|
| |
+ full_url = component.peek_repository() + "?#" + component_ref
|
| |
build = models.ComponentBuild(
|
| |
module_id=module.id,
|
| |
- package=component.get_name(),
|
| |
+ package=component.peek_name(),
|
| |
format="rpms",
|
| |
scmurl=full_url,
|
| |
batch=batch,
|
| |
ref=component_ref,
|
| |
- weight=rpm_weights[component.get_name()]
|
| |
+ weight=rpm_weights[component.peek_name()]
|
| |
)
|
| |
session.add(build)
|
| |
|
| |
Signed-off-by: Chenxiong Qi cqi@redhat.com
Some
get_*
methods are deprecated and correspondingpeek_*
methods are recommended to call. All these deprecation warnings are printed after running tests.