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

Merge remote-tracking branch 'origin/master' into cgen

Browse source
This commit is contained in:
Mike McLean 2015-11-17 10:52:42 -05:00
commit 87fb7f46e9
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cli/koji
View file

@ -6486,8 +6486,9 @@ def anon_handle_download_task(options, sessions, args):
for (task, filename, new_filename) in downloads:
number += 1
print _("Downloading [%d/%d]: %s") % (number, len(downloads), new_filename)
with open(new_filename, "wb") as output_file:
output_file.write(session.downloadTaskOutput(task["id"], filename))
output_file = open(new_filename, "wb")
output_file.write(session.downloadTaskOutput(task["id"], filename))
output_file.close()
def anon_handle_wait_repo(options, session, args):
"Wait for a repo to be regenerated"
@ -6707,7 +6708,7 @@ def handle_runroot(options, session, args):
repo_id=opts.repo_id,
skip_setarch=opts.skip_setarch,
weight=opts.weight)
except koji.GenericError as e:
except koji.GenericError, e:
if 'Invalid method' in str(e):
print "* The runroot plugin appears to not be installed on the",
print "koji hub. Please contact the administrator."

3
docs/schema.sql
View file

@ -815,6 +815,9 @@ insert into archivetypes (name, description, extensions) values ('vhd', 'Hyper-V
insert into archivetypes (name, description, extensions) values ('wsf', 'Windows script file', 'wsf');
insert into archivetypes (name, description, extensions) values ('box', 'Vagrant Box Image', 'box');
insert into archivetypes (name, description, extensions) values ('raw-xz', 'xz compressed raw disk image', 'raw.xz');
insert into archivetypes (name, description, extensions) values ('json', 'JSON data', 'json');
insert into archivetypes (name, description, extensions) values ('key', 'Key file', 'key');
insert into archivetypes (name, description, extensions) values ('dot', 'DOT graph description', 'dot gv');
-- Do we want to enforce a constraint that a build can only generate one