almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Remove unused variable

Browse Source 
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2019-05-31 10:16:44 +02:00
parent c55ed742cd
commit f6162b90dd
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pungi/phases/gather/methods/method_hybrid.py
View File

@ -17,7 +17,6 @@ import gzip
import os import os
from collections import defaultdict from collections import defaultdict
from fnmatch import fnmatch from fnmatch import fnmatch
from itertools import chain
import createrepo_c as cr import createrepo_c as cr
import kobo.rpmlib import kobo.rpmlib
@ -148,8 +147,6 @@ class GatherMethodHybrid(pungi.phases.gather.method.GatherMethodBase):
for var in self.compose.all_variants.values(): for var in self.compose.all_variants.values():
for mmd in var.arch_mmds.get(self.arch, {}).values(): for mmd in var.arch_mmds.get(self.arch, {}).values():
self.modular_packages.update(mmd.get_rpm_artifacts().dup()) self.modular_packages.update(mmd.get_rpm_artifacts().dup())
for mmd in var.dev_mmds.get(self.arch, {}).values():
self.modular_packages.update(mmd.get_rpm_artifacts().dup())
def prepare_langpacks(self, arch, variant): def prepare_langpacks(self, arch, variant):
if not self.compose.has_comps: if not self.compose.has_comps:
@ -456,9 +453,7 @@ def create_module_repo(compose, variant, arch):
# We need to include metadata for all variants. The packages are in the # We need to include metadata for all variants. The packages are in the
# set, so we need their metadata. # set, so we need their metadata.
for var in compose.all_variants.values(): for var in compose.all_variants.values():
for mmd in chain( for mmd in var.arch_mmds.get(arch, {}).values():
var.arch_mmds.get(arch, {}).values(), var.dev_mmds.get(arch, {}).values()
):
# Set the arch field, but no other changes are needed. # Set the arch field, but no other changes are needed.
repo_mmd = mmd.copy() repo_mmd = mmd.copy()
repo_mmd.set_arch(tree_arch_to_yum_arch(arch)) repo_mmd.set_arch(tree_arch_to_yum_arch(arch))

1
pungi/wrappers/variants.py
View File

@ -266,7 +266,6 @@ class Variant(object):
self.pkgset = None self.pkgset = None
self.mmds = [] self.mmds = []
self.arch_mmds = {} self.arch_mmds = {}
self.dev_mmds = {}
self.module_uid_to_koji_tag = {} self.module_uid_to_koji_tag = {}
self.nsvc_to_pkgset = {} self.nsvc_to_pkgset = {}

1
tests/helpers.py
View File

@ -62,7 +62,6 @@ class MockVariant(mock.Mock):
self.parent = kwargs.get('parent', None) self.parent = kwargs.get('parent', None)
self.mmds = [] self.mmds = []
self.arch_mmds = {} self.arch_mmds = {}
self.dev_mmds = {}
self.module_uid_to_koji_tag = {} self.module_uid_to_koji_tag = {}
self.variants = {} self.variants = {}
self.pkgset = mock.Mock(rpms_by_arch={}) self.pkgset = mock.Mock(rpms_by_arch={})