bab9bb6b69
Create new directories: ceph config config-files filesystem kernel kernel/kernel-modules ldap logging strorage-drivers tools utilities virt Retire directories: connectivity core devtools support extended Delete two packages: tgt irqbalance Relocated packages: base/ dhcp initscripts libevent lighttpd linuxptp memcached net-snmp novnc ntp openssh pam procps sanlock shadow sudo systemd util-linux vim watchdog ceph/ python-cephclient config/ facter puppet-4.8.2 puppet-modules filesystem/ e2fsprogs nfs-utils nfscheck kernel/ kernel-std kernel-rt kernel/kernel-modules/ mlnx-ofa_kernel ldap/ nss-pam-ldapd openldap logging/ syslog-ng logrotate networking/ lldpd iproute mellanox python-ryu mlx4-config python/ python-2.7.5 python-django python-gunicorn python-setuptools python-smartpm python-voluptuous security/ shim-signed shim-unsigned tboot strorage-drivers/ python-3parclient python-lefthandclient virt/ cloud-init libvirt libvirt-python qemu tools/ storage-topology vm-topology utilities/ tis-extensions namespace-utils nova-utils update-motd Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86 Story: 2002801 Task: 22687 Signed-off-by: Scott Little <scott.little@windriver.com>
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
smart - backends/rmp/metadata.py: Fix incorrect call to the match function
|
|
|
|
The match function should take three parameters, name, comparison, version...
|
|
The original code was passing it a reference to the object holding the data
|
|
instead, which caused the comparison in match to always fail.
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
|
|
|
--- a/smart/backends/rpm/metadata.py
|
|
+++ b/smart/backends/rpm/metadata.py
|
|
@@ -332,13 +332,13 @@
|
|
reqargs = [x for x in reqdict
|
|
if not ((x[2] is None or "=" in x[2]) and
|
|
(RPMProvides, x[1], x[3]) in prvdict or
|
|
- system_provides.match(*x[:3]))]
|
|
+ system_provides.match(x[1], x[2], x[3]))]
|
|
reqargs = collapse_libc_requires(reqargs)
|
|
|
|
recargs = [x for x in recdict
|
|
if not ((x[2] is None or "=" in x[2]) and
|
|
(RPMProvides, x[1], x[3]) in prvdict or
|
|
- system_provides.match(*x[:3]))]
|
|
+ system_provides.match(x[1], x[2], x[3]))]
|
|
|
|
prvargs = prvdict.keys()
|
|
cnfargs = cnfdict.keys()
|