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

fix errors in several raise statements

Browse source
This commit is contained in:
Mike McLean 2015-12-21 13:31:17 -05:00
parent 490dc1e958
commit 7bac2721f8
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
builder/kojid
View file

@ -1909,7 +1909,7 @@ class ChainMavenTask(MultiPlatformTask):
task_opts],
label=package)
else:
raise koji.BuilError, 'unsupported build type: %s' % buildtype
raise koji.BuildError, 'unsupported build type: %s' % buildtype
running[task_id] = package
del todo[package]
@ -2998,7 +2998,7 @@ class OzImageTask(BaseTaskHandler):
elif distro.startswith('SL'):
return distro.split('.')
else:
raise BuildError('Unknown or supported distro given: %s' % distro)
raise koji.BuildError('Unknown or supported distro given: %s' % distro)
def fixImageXML(self, format, filename, xmltext):
@ -3598,7 +3598,7 @@ class BuildIndirectionImageTask(OzImageTask):
buildarchives = self.session.listArchives(build['id'])
if not buildarchives:
raise koji.Builderror("Could not retrieve archives for build (%s) from NVR (%s)" %
raise koji.BuildError("Could not retrieve archives for build (%s) from NVR (%s)" %
(build['id'], nvr))
buildfiles = [ x['filename'] for x in buildarchives ]

5
hub/kojihub.py
View file

@ -5014,7 +5014,8 @@ class CG_Importer(object):
for key in legacy_types:
if key in extra:
if l_type is not None:
raise koji.GenericError("Output file has multiple archive types: %s" % fn)
raise koji.GenericError("Output file has multiple archive"
"types: %(filename)s" % fileinfo)
l_type = key
type_info = extra[key]
fileinfo['hub.l_type'] = l_type
@ -11208,7 +11209,7 @@ class HostExports(object):
archivetype = get_archive_type(relpath)
if not archivetype:
# Unknown archive type, fail the build
raise koji.BuildError, 'unsupported file type: %s' % filename
raise koji.BuildError, 'unsupported file type: %s' % relpath
filepath = os.path.join(task_dir, relpath)
metadata['relpath'] = os.path.dirname(relpath)
import_archive(filepath, build_info, 'win', metadata, buildroot_id=results['buildroot_id'])