diff --git a/homu/html/queue.html b/homu/html/queue.html index 1e70044..b4d1d33 100644 --- a/homu/html/queue.html +++ b/homu/html/queue.html @@ -207,7 +207,9 @@

Homu queue - {% if repo_url %}{{repo_ + {% if not multiple %}

Open retry log

+ {% endif %} diff --git a/homu/server.py b/homu/server.py index c56a6c5..2781372 100644 --- a/homu/server.py +++ b/homu/server.py @@ -117,8 +117,13 @@ def result(repo_label, pull): @get('/queue/') def queue(repo_label): - if repo_label not in g.cfg['repo'] and repo_label != 'all': - abort(404) + + if repo_label == 'all': + labels = g.repos.keys() + else: + labels = repo_label.split('+') + if any(label not in g.cfg['repo'] for label in labels): + abort(404) logger = g.logger.getChild('queue') @@ -126,16 +131,14 @@ def queue(repo_label): single_repo_closed = None treeclosed_src = None - if repo_label == 'all': - labels = g.repos.keys() - multiple = True - repo_url = None - else: - labels = repo_label.split('+') - multiple = len(labels) > 1 - if repo_label in g.repos and g.repos[repo_label].treeclosed >= 0: + repo_url = None + multiple = len(labels) > 1 + + if not multiple: + if g.repos[repo_label].treeclosed >= 0: single_repo_closed = g.repos[repo_label].treeclosed treeclosed_src = g.repos[repo_label].treeclosed_src + repo_url = 'https://github.com/{}/{}'.format( g.cfg['repo'][repo_label]['owner'], g.cfg['repo'][repo_label]['name'])