From 7d4a6db69fe58aa9eb99cbc4f90556652455cf3a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 15 Apr 2015 12:34:20 -0500 Subject: Don't blow up if we can't fetch an SVN revision Signed-off-by: Dan McGee --- packages/management/commands/populate_signoffs.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/management/commands/populate_signoffs.py b/packages/management/commands/populate_signoffs.py index a9c1c81c..17a05671 100644 --- a/packages/management/commands/populate_signoffs.py +++ b/packages/management/commands/populate_signoffs.py @@ -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: -- cgit v1.2.3-54-g00ecf From becb5b2356b384178002d9db6084547325ff7787 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 15 Apr 2015 17:23:18 -0500 Subject: Fix error in test where HTTP_HOST doesn't exist Signed-off-by: Dan McGee --- packages/views/__init__.py | 2 +- public/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') 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 @@ @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}, diff --git a/public/views.py b/public/views.py index 16f5db22..910b6c2d 100644 --- a/public/views.py +++ b/public/views.py @@ -25,7 +25,7 @@ def updates(): else: def updates(): return get_recent_updates() - domain = "%s://%s" % (request.scheme, request.META['HTTP_HOST']) + domain = "%s://%s" % (request.scheme, request.META.get('HTTP_HOST')) context = { 'news_updates': News.objects.order_by('-postdate', '-id')[:15], 'pkg_updates': updates, -- cgit v1.2.3-54-g00ecf From c12060e51bc4876ed6db2935cbc39879ce7f4f6b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 18 Jun 2015 16:31:09 -0500 Subject: Handle Django's level 3 verbosity properly Signed-off-by: Dan McGee --- devel/management/commands/generate_keyring.py | 2 +- devel/management/commands/pgp_import.py | 2 +- devel/management/commands/rematch_developers.py | 2 +- devel/management/commands/reporead.py | 2 +- devel/management/commands/reporead_inotify.py | 2 +- mirrors/management/commands/mirrorcheck.py | 2 +- mirrors/management/commands/mirrorresolv.py | 2 +- packages/management/commands/populate_signoffs.py | 2 +- packages/management/commands/signoff_report.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'packages') diff --git a/devel/management/commands/generate_keyring.py b/devel/management/commands/generate_keyring.py index 34bcd2f8..9c52dadc 100644 --- a/devel/management/commands/generate_keyring.py +++ b/devel/management/commands/generate_keyring.py @@ -32,7 +32,7 @@ def handle(self, *args, **options): 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/devel/management/commands/pgp_import.py b/devel/management/commands/pgp_import.py index 3f557fe9..7a124f77 100644 --- a/devel/management/commands/pgp_import.py +++ b/devel/management/commands/pgp_import.py @@ -38,7 +38,7 @@ def handle(self, *args, **options): logger.level = logging.ERROR elif v == 1: logger.level = logging.INFO - elif v == 2: + elif v >= 2: logger.level = logging.DEBUG if len(args) < 1: diff --git a/devel/management/commands/rematch_developers.py b/devel/management/commands/rematch_developers.py index 7a06e084..bbb43df0 100644 --- a/devel/management/commands/rematch_developers.py +++ b/devel/management/commands/rematch_developers.py @@ -37,7 +37,7 @@ def handle_noargs(self, **options): logger.level = logging.ERROR elif v == 1: logger.level = logging.INFO - elif v == 2: + elif v >= 2: logger.level = logging.DEBUG finder = UserFinder() diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py index 3244d593..72061176 100644 --- a/devel/management/commands/reporead.py +++ b/devel/management/commands/reporead.py @@ -70,7 +70,7 @@ def handle(self, arch=None, filename=None, **options): logger.level = logging.ERROR elif v == 1: logger.level = logging.INFO - elif v == 2: + elif v >= 2: logger.level = logging.DEBUG return read_repo(arch, filename, options) diff --git a/devel/management/commands/reporead_inotify.py b/devel/management/commands/reporead_inotify.py index e3c720bc..1422ae26 100644 --- a/devel/management/commands/reporead_inotify.py +++ b/devel/management/commands/reporead_inotify.py @@ -45,7 +45,7 @@ def handle(self, path_template=None, **options): logger.level = logging.ERROR elif v == 1: logger.level = logging.INFO - elif v == 2: + elif v >= 2: logger.level = logging.DEBUG if not path_template: diff --git a/mirrors/management/commands/mirrorcheck.py b/mirrors/management/commands/mirrorcheck.py index 374643e7..1a33073a 100644 --- a/mirrors/management/commands/mirrorcheck.py +++ b/mirrors/management/commands/mirrorcheck.py @@ -58,7 +58,7 @@ def handle_noargs(self, **options): logger.level = logging.ERROR elif v == 1: logger.level = logging.WARNING - elif v == 2: + elif v >= 2: logger.level = logging.DEBUG timeout = options.get('timeout') diff --git a/mirrors/management/commands/mirrorresolv.py b/mirrors/management/commands/mirrorresolv.py index fcf13fda..0e71894b 100644 --- a/mirrors/management/commands/mirrorresolv.py +++ b/mirrors/management/commands/mirrorresolv.py @@ -32,7 +32,7 @@ def handle_noargs(self, **options): logger.level = logging.ERROR elif v == 1: logger.level = logging.WARNING - elif v == 2: + elif v >= 2: logger.level = logging.DEBUG return resolve_mirrors() diff --git a/packages/management/commands/populate_signoffs.py b/packages/management/commands/populate_signoffs.py index 17a05671..8a025f4e 100644 --- a/packages/management/commands/populate_signoffs.py +++ b/packages/management/commands/populate_signoffs.py @@ -38,7 +38,7 @@ def handle_noargs(self, **options): 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() diff --git a/packages/management/commands/signoff_report.py b/packages/management/commands/signoff_report.py index 72fcbe1e..a5022eeb 100644 --- a/packages/management/commands/signoff_report.py +++ b/packages/management/commands/signoff_report.py @@ -44,7 +44,7 @@ def handle(self, *args, **options): 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: -- cgit v1.2.3-54-g00ecf