diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-08-06 00:06:51 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-08-06 00:06:51 -0600 |
| commit | 004317994057a974e36dab450f388005386bf209 (patch) | |
| tree | a1ec58537152d28a783bcb349c151f4d1e336171 /packages | |
| parent | 4ec2197deab2f7df1cb94a6506fac9127b3ae414 (diff) | |
| parent | d4731a373ca665d4547eb0e89cdf270d41c44243 (diff) | |
Merge branch 'archweb-generic'
# Conflicts:
# public/tests.py
# templates/base.html
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/management/commands/populate_signoffs.py | 13 | ||||
| -rw-r--r-- | packages/management/commands/signoff_report.py | 2 | ||||
| -rw-r--r-- | packages/views/__init__.py | 2 |
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 f3d64548..6195e1f0 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}, |