0001 - Added a bunch of predefined archivetypes. Most of these were
added in our internal instance over time. Let me know if any of these
look wrong.
0002 - just a nicer error message if a host authenticates as a non-host user
>From 5d7da674b36f5ba9f843fb7322f753ec05e51eb6 Mon Sep 17 00:00:00 2001
From: Mike McLean <[email protected]>
Date: Tue, 17 Feb 2015 16:15:11 -0500
Subject: [PATCH 1/2] update predefined archivetypes
---
docs/schema.sql | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/docs/schema.sql b/docs/schema.sql
index 56418c9..c087d56 100644
--- a/docs/schema.sql
+++ b/docs/schema.sql
@@ -695,10 +695,10 @@ CREATE TABLE archivetypes (
extensions TEXT NOT NULL
) WITHOUT OIDS;
-insert into archivetypes (name, description, extensions) values ('jar', 'Jar file', 'jar war rar ear');
-insert into archivetypes (name, description, extensions) values ('zip', 'Zip archive', 'zip');
+insert into archivetypes (name, description, extensions) values ('jar', 'Jar file', 'jar war rar ear sar jdocbook jdocbook-style');
+insert into archivetypes (name, description, extensions) values ('zip', 'Zip file', 'zip');
insert into archivetypes (name, description, extensions) values ('pom', 'Maven Project Object Management file', 'pom');
-insert into archivetypes (name, description, extensions) values ('tar', 'Tar file', 'tar tar.gz tar.bz2');
+insert into archivetypes (name, description, extensions) values ('tar', 'Tar file', 'tar tar.gz tar.bz2 tar.xz');
insert into archivetypes (name, description, extensions) values ('xml', 'XML file', 'xml');
insert into archivetypes (name, description, extensions) values ('xsd', 'XML Schema Definition', 'xsd');
insert into archivetypes (name, description, extensions) values ('spec', 'RPM spec file', 'spec');
@@ -716,10 +716,27 @@ insert into archivetypes (name, description, extensions) values ('raw', 'Raw dis
insert into archivetypes (name, description, extensions) values ('qcow', 'QCOW image', 'qcow');
insert into archivetypes (name, description, extensions) values ('qcow2', 'QCOW2 image', 'qcow2');
insert into archivetypes (name, description, extensions) values ('vmdk', 'vSphere image', 'vmdk');
-insert into archivetypes (name, description, extensions) values ('ova', 'OVA image', 'ova');
+insert into archivetypes (name, description, extensions) values ('ova', 'Open Virtualization Archive', 'ova');
insert into archivetypes (name, description, extensions) values ('ks', 'Kickstart', 'ks');
insert into archivetypes (name, description, extensions) values ('cfg', 'Configuration file', 'cfg');
insert into archivetypes (name, description, extensions) values ('vdi', 'VirtualBox Virtual Disk Image', 'vdi');
+insert into archivetypes (name, description, extensions) values ('aar', 'Binary distribution of an Android Library project', 'aar');
+insert into archivetypes (name, description, extensions) values ('apklib', 'Source distribution of an Android Library project', 'apklib');
+insert into archivetypes (name, description, extensions) values ('cab', 'Windows cabinet file', 'cab');
+insert into archivetypes (name, description, extensions) values ('dylib', 'OS X dynamic library', 'dylib');
+insert into archivetypes (name, description, extensions) values ('gem', 'Ruby gem', 'gem');
+insert into archivetypes (name, description, extensions) values ('ini', 'INI config file', 'ini');
+insert into archivetypes (name, description, extensions) values ('js', 'Javascript file', 'js');
+insert into archivetypes (name, description, extensions) values ('ldif', 'LDAP Data Interchange Format file', 'ldif');
+insert into archivetypes (name, description, extensions) values ('manifest', 'Runtime environment for .NET applications', 'manifest');
+insert into archivetypes (name, description, extensions) values ('msm', 'Windows merge module', 'msm');
+insert into archivetypes (name, description, extensions) values ('properties', 'Properties file', 'properties');
+insert into archivetypes (name, description, extensions) values ('sig', 'Signature file', 'sig signature');
+insert into archivetypes (name, description, extensions) values ('so', 'Shared library', 'so');
+insert into archivetypes (name, description, extensions) values ('txt', 'Text file', 'txt');
+insert into archivetypes (name, description, extensions) values ('vhd', 'Hyper-V image', 'vhd');
+insert into archivetypes (name, description, extensions) values ('wsf', 'Windows script file', 'wsf');
+
-- Do we want to enforce a constraint that a build can only generate one
-- archive with a given name?
--
1.9.3
>From 7e992163df7d9cbd74f7a7f78d35493719402b83 Mon Sep 17 00:00:00 2001
From: Mike McLean <[email protected]>
Date: Wed, 18 Feb 2015 18:46:47 -0500
Subject: [PATCH 2/2] slightly better errors for host auth failures
---
hub/kojihub.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hub/kojihub.py b/hub/kojihub.py
index f794d5d..746acab 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -9524,7 +9524,10 @@ class Host(object):
if id is None:
id = remote_id
if id is None:
- raise koji.AuthError, "No host specified"
+ if context.session.logged_in:
+ raise koji.AuthError, "User %i is not a host" % context.session.user_id
+ else:
+ raise koji.AuthError, "Not logged in"
self.id = id
self.same_host = (id == remote_id)
--
1.9.3
--
buildsys mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/buildsys
