[PATCH] remove stray # from literal footers in web ui
by Mike McLean
---
www/kojiweb/includes/footer.chtml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/kojiweb/includes/footer.chtml b/www/kojiweb/includes/footer.chtml
index 8e22022..0e97021 100644
--- a/www/kojiweb/includes/footer.chtml
+++ b/www/kojiweb/includes/footer.chtml
@@ -10,7 +10,7 @@
#if os.path.exists($localfooterpath)
#if $literalFooter
#set $localfooter="".join(open($localfooterpath).readlines())
-#$localfooter
+$localfooter
#else
#include $localfooterpath
#end if
--
2.1.0
7 years, 10 months
[PATCH] taginfo: return error code if tag does not exist, drop stray newlines
by Mike McLean
---
cli/koji | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/cli/koji b/cli/koji
index 56ab82a..6724304 100755
--- a/cli/koji
+++ b/cli/koji
@@ -4466,11 +4466,18 @@ def anon_handle_taginfo(options, session, args):
print "Querying at event %(id)i (%(timestr)s)" % event
event_opts['event'] = event['id']
perms = dict([(p['id'], p['name']) for p in session.getAllPerms()])
+
+ tags = []
for tag in args:
info = session.getTag(tag, **event_opts)
if info is None:
- print "No such tag: %s\n" % tag
- continue
+ print "No such tag: %s" % tag
+ sys.exit(1)
+ tags.append(info)
+
+ for n, info in enumerate(tags):
+ if n > 0:
+ print
print "Tag: %(name)s [%(id)d]" %info
print "Arches: %(arches)s" %info
group_list = [x['name'] for x in session.getTagGroups(info['id'], **event_opts)]
@@ -4538,7 +4545,7 @@ def anon_handle_taginfo(options, session, args):
print " maxdepth: %(maxdepth)s" % parent
if parent['pkg_filter']:
print " package filter: %(pkg_filter)s" % parent
- print
+
def handle_add_tag(options, session, args):
"[admin] Add a new tag to the database"
--
2.1.0
7 years, 10 months
[PATCH] remove mutable default args in _do_target_image
by Mike McLean
---
builder/kojid | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/builder/kojid b/builder/kojid
index ad427cd..d0ab9de 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -3300,7 +3300,7 @@ class BaseImageTask(OzImageTask):
'docker', img_opts=img_opts)
return {'image': targ.target_image.data}
- def _do_target_image(self, base_id, image_type, img_opts={}, fixed_params=[]):
+ def _do_target_image(self, base_id, image_type, img_opts=None, fixed_params=None):
"""
A generic method for building what ImageFactory calls "target images".
These are images based on a raw disk that was built before using the
@@ -3321,6 +3321,10 @@ class BaseImageTask(OzImageTask):
# TODO: test the failure case where IF itself throws an exception
# ungracefully (missing a plugin for example)
# may need to still upload ozlog and remove the log handler
+ if img_opts is None:
+ img_opts = {}
+ if fixed_params is None:
+ fixed_params = []
self.logger.debug('img_opts_pre_merge: %s' % img_opts)
self._mergeFactoryParams(img_opts, fixed_params)
self.logger.debug('img_opts_post_merge: %s' % img_opts)
--
2.1.0
7 years, 10 months
[PATCH] cleanup the build directory when re-running a failed build
by Mike Bonnet
In certain circumstances a failed build can leave stray files on the
filesystem. The presence of these files can cause subsequent builds to
fail because of filename collisions. This patch removes the build
directory (if it exists) when re-running a failed or canceled build.
7 years, 10 months
Fwd: Migration of the mailing-lists to Mailman3 and HyperKitty
by Mike McLean
Hyperkitty migration is live for this list now
https://lists.fedorahosted.org/archives/list/koji-devel@lists.fedorahoste...
-------- Forwarded Message --------
Subject: Migration of the mailing-lists to Mailman3 and HyperKitty
Date: Tue, 10 Nov 2015 15:15:26 +0100
From: Aurelien Bompard <abompard(a)fedoraproject.org>
Reply-To: devel(a)lists.fedoraproject.org
To: announce(a)lists.fedoraproject.org,
devel-announce(a)lists.fedoraproject.org,
fedorahosted-announce(a)lists.fedorahosted.org
Dear list users,
The Fedora Engineering team has been working on a new system for our
mailing lists. Mailman 3 came out earlier this year and it has a new
shiny web UI: HyperKitty.
The Fedora Hosted lists will be migrated on November 16th, and the
Fedora project lists later in the week. After migration you should be
able to use the new hyperkitty UI to post and read the lists if you
choose or continue to get emails in the traditional way.
There may be some changes in some headers, so if you filter your list
emails be ready to adjust your filters. See wiki page below for
details:
http://fedoraproject.org/wiki/Mailman3_Migration
Some lists using mailman2 features not yet available in mailman3 will
be migrated later. More information as well as current lists migrated,
being migrated and deferred for migration can be found at:
http://fedoraproject.org/wiki/Mailman3_Migration/Status
If you have any questions, feel free to ask on the infrastructure
list: infrastructure(a)lists.fedoraproject.org.
If you find a problem or issue, please file a fedora infrastructure
ticket and we will work to fix things for your case or bug:
https://fedorahosted.org/fedora-infrastructure/
The Fedora Infrastructure team
_______________________________________________
devel-announce mailing list
devel-announce(a)lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel-announce
7 years, 10 months
[PATCH] new archive types: json, key, dot
by Mike McLean
---
docs/schema.sql | 3 +++
1 file changed, 3 insertions(+)
diff --git a/docs/schema.sql b/docs/schema.sql
index d5ffa87..e09a412 100644
--- a/docs/schema.sql
+++ b/docs/schema.sql
@@ -755,6 +755,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
--
2.1.0
7 years, 10 months
Koji Project Website and Docs proposal
by Adam Miller
Hello all,
We had previously talked about making some changes to the koji
project as a whole and for those who might not have noticed, koji is
now hosted on pagure[0] which opens up all kinds of opportunities for
git topic branch style workflows.
Aside from the move to pagure it was being discussed to have a Koji
project website such that it will exist as a stand alone single point
of entry for newcomers who are not familiar with the project.
I've written a proposal website skeleton with a very small amount of
content written in reStructured Text and rendered using Nikola[1]
static site generator. This proposal has been submitted as a pull
request to the koji code base[2].
Now, we would need to expand the content substantially and decide on a
domain name for the project site to live. I was initially thinking of
https://koji.build just because it came to mind but I'm very open to
suggestion.
Another thing I worked on is converting all relevant documentation I
could find in the Fedora Wiki as well as pre-existing in the koji git
repository to reStructured Text to be rendered with sphinx-doc[3].
This has also been submitted as a pull request to the koji code
base[4].
The main motivation behind this is to make koji more inviting to new
users and developers who share a common interest in build systems and
to hopefully foster a growing community of users and developers around
koji.
With these changes my hope is that the koji project will have a single
unified "landing space" on the internet where we can easily direct new
community members. As it stands today, koji content is a bit spread
across many different areas which isn't necessarily problematic so
long as we index or present it properly, but this series of changes
takes it a step further and brings all the content (in source
"unrendered" format anyways) under the umbrella of the koji git
repository so everything truly lives in one place.
I look forward to your feedback.
Thank you,
-AdamM
[0] - https://pagure.io/koji
[1] - https://getnikola.com/
[2] - https://pagure.io/koji/pull-request/3
[3] - http://sphinx-doc.org/
[4] - https://pagure.io/koji/pull-request/2
7 years, 10 months
[PATCH] add groovy script archive type
by Mike McLean
---
docs/schema.sql | 1 +
1 file changed, 1 insertion(+)
diff --git a/docs/schema.sql b/docs/schema.sql
index d5ffa87..df9f36d 100644
--- a/docs/schema.sql
+++ b/docs/schema.sql
@@ -755,6 +755,7 @@ 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 ('groovy', 'Groovy script file', 'groovy gvy');
-- Do we want to enforce a constraint that a build can only generate one
--
2.1.0
7 years, 11 months