diff options
Diffstat (limited to 'devel/management/commands')
| -rw-r--r-- | devel/management/commands/reporead.py | 7 | ||||
| -rw-r--r-- | devel/management/commands/update_types_permissions.py | 16 |
2 files changed, 13 insertions, 10 deletions
diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py index 3244d593..1945469f 100644 --- a/devel/management/commands/reporead.py +++ b/devel/management/commands/reporead.py @@ -107,6 +107,8 @@ class RepoPackage(object): setattr(self, k, long(v[0])) elif k in ('desc', 'pgpsig'): # do NOT prune these values at all + if v[0] == None: + v[0] = 'missing' setattr(self, k, v[0]) elif k == 'version': self.ver, self.rel, self.epoch = parse_version(v[0]) @@ -215,7 +217,10 @@ def populate_pkg(dbpkg, repopkg, force=False, timestamp=None): dbpkg.pkgver = repopkg.ver dbpkg.pkgrel = repopkg.rel dbpkg.epoch = repopkg.epoch - dbpkg.pkgdesc = repopkg.desc + try: + dbpkg.pkgdesc = repopkg.desc + except AttributeError: + dbpkg.pkgdesc = "missing" dbpkg.url = repopkg.url dbpkg.filename = repopkg.filename dbpkg.compressed_size = repopkg.csize diff --git a/devel/management/commands/update_types_permissions.py b/devel/management/commands/update_types_permissions.py index bbe8dc47..ac8fcfa5 100644 --- a/devel/management/commands/update_types_permissions.py +++ b/devel/management/commands/update_types_permissions.py @@ -1,5 +1,5 @@ from django.core.management.base import BaseCommand -from django.db.models import get_models, get_app +from django.apps import apps from django.contrib.auth.management import create_permissions from django.contrib.contenttypes.management import update_contenttypes @@ -10,16 +10,14 @@ class Command(BaseCommand): def handle(self, *args, **options): if not args: - apps = [] - for model in get_models(): - apps.append(get_app(model._meta.app_label)) + app_configs = apps.get_app_configs() else: - apps = [] + app_configs = [] for arg in args: - apps.append(get_app(arg)) + apps.append(apps.get_app_config(arg)) - for app in apps: - update_contenttypes(app, None, options.get('verbosity', 2), interactive=True) - create_permissions(app, get_models(), options.get('verbosity', 0)) + for app_config in app_configs: + update_contenttypes(app_config, options.get('verbosity', 2)) + create_permissions(app_config, options.get('verbosity', 22)) # vim: set ts=4 sw=4 et: |