diff options
Diffstat (limited to 'meta/recipes-devtools/python/python-smartpm/smart-multilib-fixes.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python-smartpm/smart-multilib-fixes.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-multilib-fixes.patch b/meta/recipes-devtools/python/python-smartpm/smart-multilib-fixes.patch deleted file mode 100644 index 56fef79a5f..0000000000 --- a/meta/recipes-devtools/python/python-smartpm/smart-multilib-fixes.patch +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | To fix some multilib issues, change the way the RPM backend decides | ||
| 2 | if two packages can coexist: if they have a different architecture, | ||
| 3 | automatically assume that they can coexist (which is fundamental for | ||
| 4 | multilib). | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> | ||
| 9 | |||
| 10 | diff --git a/smart/backends/rpm/base.py b/smart/backends/rpm/base.py | ||
| 11 | index 6e83d40..7140c1b 100644 | ||
| 12 | --- a/smart/backends/rpm/base.py | ||
| 13 | +++ b/smart/backends/rpm/base.py | ||
| 14 | @@ -228,6 +228,8 @@ class RPMPackage(Package): | ||
| 15 | return False | ||
| 16 | selfver, selfarch = splitarch(self.version) | ||
| 17 | otherver, otherarch = splitarch(other.version) | ||
| 18 | + if selfarch != otherarch: | ||
| 19 | + return True | ||
| 20 | selfcolor = getArchColor(selfarch) | ||
| 21 | othercolor = getArchColor(otherarch) | ||
| 22 | if (selfcolor and othercolor and selfcolor != othercolor and | ||
