summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-08-05 23:59:03 -0600
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-08-05 23:59:03 -0600
commitd4731a373ca665d4547eb0e89cdf270d41c44243 (patch)
tree41dbfb57e5f6745ad6ac3acd5de8c4d9788c950c /packages
parentc8d979b8a48805d162ab46cdc4e493da0aa1595c (diff)
parent803ba89841468bcf088ea79ea981a849ca159682 (diff)
Merge branch 'archweb' into archweb-generic
Diffstat (limited to 'packages')
-rw-r--r--packages/management/commands/populate_signoffs.py13
-rw-r--r--packages/management/commands/signoff_report.py2
-rw-r--r--packages/views/__init__.py2
3 files changed, 10 insertions, 7 deletions
diff --git a/packages/management/commands/populate_signoffs.py b/packages/management/commands/populate_signoffs.py
index a9c1c81c..8a025f4e 100644
--- a/packages/management/commands/populate_signoffs.py
+++ b/packages/management/commands/populate_signoffs.py
@@ -38,7 +38,7 @@ is signoff-eligible and does not have an existing comment attached"""
logger.level = logging.ERROR
elif v == 1:
logger.level = logging.INFO
- elif v == 2:
+ elif v >= 2:
logger.level = logging.DEBUG
return add_signoff_comments()
@@ -95,9 +95,12 @@ def add_signoff_comments():
continue
logger.debug("getting SVN log for %s (%s)", group.pkgbase, group.repo)
- log = cached_svn_log(group.pkgbase, group.repo)
- logger.info("creating spec with SVN message for %s", group.pkgbase)
- spec = create_specification(group.packages[0], log, finder)
- spec.save()
+ try:
+ log = cached_svn_log(group.pkgbase, group.repo)
+ logger.info("creating spec with SVN message for %s", group.pkgbase)
+ spec = create_specification(group.packages[0], log, finder)
+ spec.save()
+ except:
+ logger.exception("error getting SVN log for %s", group.pkgbase)
# vim: set ts=4 sw=4 et:
diff --git a/packages/management/commands/signoff_report.py b/packages/management/commands/signoff_report.py
index d104288a..9724e562 100644
--- a/packages/management/commands/signoff_report.py
+++ b/packages/management/commands/signoff_report.py
@@ -45,7 +45,7 @@ class Command(BaseCommand):
logger.level = logging.ERROR
elif v == 1:
logger.level = logging.INFO
- elif v == 2:
+ elif v >= 2:
logger.level = logging.DEBUG
if len(args) != 2:
diff --git a/packages/views/__init__.py b/packages/views/__init__.py
index 6b44206a..7941a265 100644
--- a/packages/views/__init__.py
+++ b/packages/views/__init__.py
@@ -27,7 +27,7 @@ from .signoff import signoffs, signoff_package, signoff_options, signoffs_json
@require_safe
@cache_control(public=True, max_age=86400)
def opensearch(request):
- domain = "%s://%s" % (request.scheme, request.META['HTTP_HOST'])
+ domain = "%s://%s" % (request.scheme, request.META.get('HTTP_HOST'))
return render(request, 'packages/opensearch.xml',
{'domain': domain},