diff --git a/src/cmd-koji-upload b/src/cmd-koji-upload index 495af86fa1..0543d45c7f 100755 --- a/src/cmd-koji-upload +++ b/src/cmd-koji-upload @@ -202,15 +202,13 @@ class Build(_Build): if host is None: rpms = self.commit["rpmostree.rpmdb.pkglist"] else: - host_rpms = subprocess.check_output('rpm -qa --qf="%{NAME}:%{EPOCH}:%{RELEASE}:%{VERSION}:%{ARCH}:%{SIGMD5}:%{SIGPGP} \n"', shell=True).strip() - rpms = (host_rpms.decode('utf-8')).split("\n") - + rpms = self.config["pkglist"] for rpm in rpms: if host is None: name, epoch, version, release, arch = rpm - sigmd5, sigpgp, epoch = None, None, None + sigmd5, sigpgp = None, None else: - name, epoch, release, version, arch, sigmd5, sigpgp = rpm.split(':') + name, epoch, version, release, arch, sigmd5, sigpgp = rpm entry = { "type": "rpm", "name": name, diff --git a/src/cmdlib.sh b/src/cmdlib.sh index f3c6acc0df..c8a0880ccb 100755 --- a/src/cmdlib.sh +++ b/src/cmdlib.sh @@ -942,6 +942,12 @@ prepare_git_artifacts() { info "Directory ${gitd}, is from branch ${branch}, commit ${rev}" + pkglist=$(python3 -c " +import sys +sys.path.insert(0, '${DIR}') +from cosalib import cmdlib +print(cmdlib.create_cosa_rpm_list())") + # shellcheck disable=SC2046 disable=SC2086 cat > "${json}" <