diff options
author | Luke Shumaker <lukeshu@proton.parabola.nu> | 2018-07-18 06:11:39 +0100 |
---|---|---|
committer | ParabolaWeb <parabolaweb@parabola.nu> | 2018-07-18 06:11:39 +0100 |
commit | c260f1ccd6a034820e76ea0a08f94fad819e0aca (patch) | |
tree | 9589738b72c44e936893bad80b681504a287bb64 | |
parent | d30bc8acc42a3678da4ad340288195dd1d17feee (diff) |
reporead: just set the arch to the main archparabolaweb-2018-07-18-2
-rw-r--r-- | devel/management/commands/reporead.py | 3 | ||||
-rw-r--r-- | main/fixtures/arches.json | 36 |
2 files changed, 2 insertions, 37 deletions
diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py index 548245c8..72215382 100644 --- a/devel/management/commands/reporead.py +++ b/devel/management/commands/reporead.py @@ -579,7 +579,8 @@ def read_repo(primary_arch, repo_file, options): for package in packages: if package.arch == 'any': - setattr(package, 'arch', 'any_%s' % primary_arch.name) + # https://labs.parabola.nu/issues/1666 + setattr(package, 'arch', primary_arch.name) if package.arch in packages_arches: packages_arches[package.arch].append(package) else: diff --git a/main/fixtures/arches.json b/main/fixtures/arches.json index 767f16e3..fa245941 100644 --- a/main/fixtures/arches.json +++ b/main/fixtures/arches.json @@ -1,14 +1,5 @@ [ { - "pk": 1, - "model": "main.arch", - "fields": { - "agnostic": true, - "name": "any", - "required_signoffs": 2 - } -}, -{ "pk": 2, "model": "main.arch", "fields": { @@ -34,32 +25,5 @@ "name": "armv7h", "required_signoffs": 1 } -}, -{ - "pk": 5, - "model": "main.arch", - "fields": { - "agnostic": true, - "name": "any_i686", - "required_signoffs": 1 - } -}, -{ - "pk": 6, - "model": "main.arch", - "fields": { - "agnostic": true, - "name": "any_x86_64", - "required_signoffs": 1 - } -}, -{ - "pk": 7, - "model": "main.arch", - "fields": { - "agnostic": true, - "name": "any_armv7h", - "required_signoffs": 1 - } } ] |