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>
23 lines
874 B
Diff
23 lines
874 B
Diff
To fix some multilib issues, change the way the RPM backend decides
|
|
if two packages can coexist: if they have a different architecture,
|
|
automatically assume that they can coexist (which is fundamental for
|
|
multilib).
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
|
|
|
|
diff --git a/smart/backends/rpm/base.py b/smart/backends/rpm/base.py
|
|
index 6e83d40..7140c1b 100644
|
|
--- a/smart/backends/rpm/base.py
|
|
+++ b/smart/backends/rpm/base.py
|
|
@@ -228,6 +228,8 @@ class RPMPackage(Package):
|
|
return False
|
|
selfver, selfarch = splitarch(self.version)
|
|
otherver, otherarch = splitarch(other.version)
|
|
+ if selfarch != otherarch:
|
|
+ return True
|
|
selfcolor = getArchColor(selfarch)
|
|
othercolor = getArchColor(otherarch)
|
|
if (selfcolor and othercolor and selfcolor != othercolor and
|