diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/forms.py | 2 | ||||
| -rw-r--r-- | devel/management/commands/pgp_import.py | 2 | ||||
| -rw-r--r-- | devel/management/commands/rematch_developers.py | 4 | ||||
| -rw-r--r-- | devel/management/commands/reporead.py | 3 | ||||
| -rw-r--r-- | devel/management/commands/reporead_inotify.py | 17 | ||||
| -rw-r--r-- | devel/reports.py | 16 |
6 files changed, 23 insertions, 21 deletions
diff --git a/devel/forms.py b/devel/forms.py index d953c614..0968acf4 100644 --- a/devel/forms.py +++ b/devel/forms.py @@ -60,7 +60,7 @@ class NewUserForm(forms.ModelForm): 'alias', 'public_email') for key in keys: self.fields[key] = old[key] - for key, val in old.items(): + for key, _ in old.items(): if key not in keys: self.fields[key] = old[key] diff --git a/devel/management/commands/pgp_import.py b/devel/management/commands/pgp_import.py index 7a124f77..8eb06d50 100644 --- a/devel/management/commands/pgp_import.py +++ b/devel/management/commands/pgp_import.py @@ -7,7 +7,7 @@ Import keys and signatures from a given GPG keyring. Usage: ./manage.py pgp_import <keyring_path> """ -from collections import namedtuple, OrderedDict +from collections import OrderedDict from datetime import datetime import logging from pytz import utc diff --git a/devel/management/commands/rematch_developers.py b/devel/management/commands/rematch_developers.py index bbb43df0..8636002a 100644 --- a/devel/management/commands/rematch_developers.py +++ b/devel/management/commands/rematch_developers.py @@ -59,7 +59,7 @@ def match_packager(finder): user = finder.find(packager) if user: mapping[packager] = user - logger.debug(" found user %s" % user.username) + logger.debug(" found user %s", user.username) matched_count += 1 for packager_str, user in mapping.items(): @@ -85,7 +85,7 @@ def match_flagrequest(finder): user = finder.find_by_email(user_email) if user: mapping[user_email] = user - logger.debug(" found user %s" % user.username) + logger.debug(" found user %s", user.username) matched_count += 1 for user_email, user in mapping.items(): diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py index c97c2384..92d745bd 100644 --- a/devel/management/commands/reporead.py +++ b/devel/management/commands/reporead.py @@ -338,7 +338,8 @@ def update_common(archname, reponame, pkgs, sanity_check=True): # necessary to guard against simultaneous updates. with transaction.atomic(): # force the transaction dirty, even though we will only do reads - transaction.set_dirty() + # https://github.com/django/django/blob/3c447b108ac70757001171f7a4791f493880bf5b/docs/releases/1.3.txt#L606 + #transaction.set_dirty() repository = Repo.objects.get(name__iexact=reponame) architecture = Arch.objects.get(name=archname) diff --git a/devel/management/commands/reporead_inotify.py b/devel/management/commands/reporead_inotify.py index 1422ae26..fadcb881 100644 --- a/devel/management/commands/reporead_inotify.py +++ b/devel/management/commands/reporead_inotify.py @@ -35,6 +35,7 @@ logging.basicConfig( stream=sys.stderr) logger = logging.getLogger() + class Command(BaseCommand): help = "Watch database files and run an update when necessary." args = "[path_template]" @@ -73,16 +74,16 @@ class Command(BaseCommand): directories we need to watch for database updates. It then validates and passes these on to the various pyinotify pieces as necessary and finally builds and returns a notifier object.''' - transaction.commit_manually() - arches = Arch.objects.filter(agnostic=False) - repos = Repo.objects.all() - transaction.set_dirty() + with transaction.atomic(): + arches = Arch.objects.filter(agnostic=False) + repos = Repo.objects.all() + arch_path_map = {arch: None for arch in arches} all_paths = set() total_paths = 0 for arch in arches: - combos = ({ 'repo': repo.name.lower(), 'arch': arch.name } - for repo in repos) + combos = ({'repo': repo.name.lower(), 'arch': arch.name} + for repo in repos) # take a python format string and generate all unique combinations # of directories from it; using set() ensures we filter it down paths = {self.path_template % values for values in combos} @@ -97,7 +98,7 @@ class Command(BaseCommand): # template mapped to only one architecture if total_paths != len(all_paths): raise CommandError('path template did not uniquely ' - 'determine architecture for each file') + 'determine architecture for each file') # A proper atomic replacement of the database as done by rsync is type # IN_MOVED_TO. repo-add/remove will finish with a IN_CLOSE_WRITE. @@ -131,7 +132,7 @@ class Database(object): def _start_update_countdown(self): self.update_thread = threading.Timer(self.delay, self.update) logger.info('Starting %.1f second countdown to update %s', - self.delay, self.path) + self.delay, self.path) self.update_thread.start() def queue_for_update(self, mtime): diff --git a/devel/reports.py b/devel/reports.py index 66fbd627..b754b264 100644 --- a/devel/reports.py +++ b/devel/reports.py @@ -5,7 +5,7 @@ from django.db.models import F from django.template.defaultfilters import filesizeformat from django.utils.timezone import now -from .models import DeveloperKey, UserProfile +from .models import DeveloperKey from main.models import PackageFile from packages.models import PackageRelation, Depend @@ -21,19 +21,19 @@ class DeveloperReport(object): self.personal = personal -def old(packages, username): +def old(packages): cutoff = now() - timedelta(days=365 * 2) return packages.filter( build_date__lt=cutoff).order_by('build_date') -def outofdate(packages, username): +def outofdate(packages): cutoff = now() - timedelta(days=30) return packages.filter( flag_date__lt=cutoff).order_by('flag_date') -def big(packages, username): +def big(packages): cutoff = 50 * 1024 * 1024 packages = packages.filter( compressed_size__gte=cutoff).order_by('-compressed_size') @@ -46,7 +46,7 @@ def big(packages, username): return packages -def badcompression(packages, username): +def badcompression(packages): cutoff = 0.90 * F('installed_size') packages = packages.filter(compressed_size__gt=25*1024, installed_size__gt=25*1024, @@ -95,7 +95,7 @@ def uncompressed_info(packages, username): return packages.filter(id__in=set(bad_files)) -def unneeded_orphans(packages, username): +def unneeded_orphans(packages): owned = PackageRelation.objects.all().values('pkgbase') required = Depend.objects.all().values('name') # The two separate calls to exclude is required to do the right thing @@ -103,7 +103,7 @@ def unneeded_orphans(packages, username): pkgname__in=required) -def mismatched_signature(packages, username): +def mismatched_signature(packages): filtered = [] packages = packages.select_related( 'arch', 'repo', 'packager').filter(signature_bytes__isnull=False) @@ -127,7 +127,7 @@ def mismatched_signature(packages, username): return filtered -def signature_time(packages, username): +def signature_time(packages): cutoff = timedelta(hours=24) filtered = [] packages = packages.select_related( |