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

allow Maven builds using --skip-tag to succeed even if the package is not in the package list, or is blocked (consistent with rpm-based builds)

Browse source
This commit is contained in:
Mike Bonnet 2010-01-19 23:32:59 -05:00
parent a4a4246907
commit afb6dadc76
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
builder/kojid
View file

@ -2330,14 +2330,15 @@ class MavenTask(BaseTaskHandler):
maven_info = maven_results['maven_info']
build_info = koji.maven_info_to_nvr(maven_info)
dest_cfg = session.getPackageConfig(dest_tag['id'], build_info['name'])
# Make sure package is on the list for this tag
if dest_cfg is None:
raise koji.BuildError, "package %s not in list for tag %s" \
% (build_info['name'], dest_tag['name'])
elif dest_cfg['blocked']:
raise koji.BuildError, "package %s is blocked for tag %s" \
% (build_info['name'], dest_tag['name'])
if not self.opts.get('skip_tag'):
dest_cfg = session.getPackageConfig(dest_tag['id'], build_info['name'])
# Make sure package is on the list for this tag
if dest_cfg is None:
raise koji.BuildError, "package %s not in list for tag %s" \
% (build_info['name'], dest_tag['name'])
elif dest_cfg['blocked']:
raise koji.BuildError, "package %s is blocked for tag %s" \
% (build_info['name'], dest_tag['name'])
self.build_id, build_info = session.host.initMavenBuild(self.id, build_info, maven_info)