diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-23 21:57:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-23 21:57:59 -0400 |
| commit | 55b776d58999412cd6bf0787a41d6ab00bf80fb6 (patch) | |
| tree | e6c151ee22207465346b230f92a42d75576409d1 /packages/utils.py | |
| parent | 4578eb77da75c24f9b366c2ade46f55b0702b340 (diff) | |
| parent | ac1c00ee86cc0e355af5e4e6be47ca861091356b (diff) | |
Merge branch 'archweb' into archweb-generic2
Diffstat (limited to 'packages/utils.py')
| -rw-r--r-- | packages/utils.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/utils.py b/packages/utils.py index 4f3b8665..6ec39483 100644 --- a/packages/utils.py +++ b/packages/utils.py @@ -14,7 +14,7 @@ from main.utils import (database_vendor, groupby_preserve_order, PackageStandin) from .models import (PackageGroup, PackageRelation, License, Depend, Conflict, Provision, Replacement, - SignoffSpecification, Signoff, DEFAULT_SIGNOFF_SPEC) + SignoffSpecification, Signoff, fake_signoff_spec) VERSION_RE = re.compile(r'^((\d+):)?(.+)-([^-]+)$') @@ -297,7 +297,6 @@ class PackageSignoffGroup(object): self.user = None self.target_repo = None self.signoffs = set() - self.specification = DEFAULT_SIGNOFF_SPEC self.default_spec = True first = packages[0] @@ -308,6 +307,7 @@ class PackageSignoffGroup(object): self.last_update = first.last_update self.packager = first.packager self.maintainers = first.maintainers + self.specification = fake_signoff_spec(first.arch) version = first.full_version if all(version == pkg.full_version for pkg in packages): @@ -410,7 +410,8 @@ def get_current_signoffs(repos): def get_current_specifications(repos): '''Returns a list of signoff specification objects for the given repos.''' to_fetch = signoffs_id_query(SignoffSpecification, repos) - return SignoffSpecification.objects.in_bulk(to_fetch).values() + return SignoffSpecification.objects.select_related('arch').in_bulk( + to_fetch).values() def get_target_repo_map(repos): |