|
|
|
@ -203,31 +203,12 @@ class KojiMock:
|
|
|
|
|
packages = []
|
|
|
|
|
|
|
|
|
|
# get all rpms in folder
|
|
|
|
|
rpms = search_rpms(self._packages_dir)
|
|
|
|
|
all_rpms = [package.path for package in rpms]
|
|
|
|
|
rpms = search_rpms(Path(self._packages_dir))
|
|
|
|
|
|
|
|
|
|
# get nvras for modular packages
|
|
|
|
|
nvras = set()
|
|
|
|
|
for module in self._modules.values():
|
|
|
|
|
path = os.path.join(
|
|
|
|
|
self._modules_dir,
|
|
|
|
|
module.arch,
|
|
|
|
|
module.nvr,
|
|
|
|
|
)
|
|
|
|
|
info = Modulemd.ModuleStream.read_string(open(path).read(), strict=True)
|
|
|
|
|
|
|
|
|
|
for package in info.get_rpm_artifacts():
|
|
|
|
|
data = parse_nvra(package)
|
|
|
|
|
nvras.add((data['name'], data['version'], data['release'], data['arch']))
|
|
|
|
|
|
|
|
|
|
# and remove modular packages from global list
|
|
|
|
|
for rpm in all_rpms[:]:
|
|
|
|
|
data = parse_nvra(os.path.basename(rpm[:-4]))
|
|
|
|
|
if (data['name'], data['version'], data['release'], data['arch']) in nvras:
|
|
|
|
|
all_rpms.remove(rpm)
|
|
|
|
|
|
|
|
|
|
for rpm in all_rpms:
|
|
|
|
|
info = parse_nvra(os.path.basename(rpm))
|
|
|
|
|
for rpm in rpms:
|
|
|
|
|
info = parse_nvra(rpm.path.stem)
|
|
|
|
|
if 'module' in info['release']:
|
|
|
|
|
continue
|
|
|
|
|
packages.append({
|
|
|
|
|
"build_id": RELEASE_BUILD_ID,
|
|
|
|
|
"name": info['name'],
|
|
|
|
|