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
tion value='dizzy'>dizzy</option>
<option value='dora'>dora</option>
<option value='dylan'>dylan</option>
<option value='fido'>fido</option>
<option value='jethro'>jethro</option>
<option value='krogoth'>krogoth</option>
<option value='master' selected='selected'>master</option>
<option value='master-next'>master-next</option>
<option value='master-next-1.9'>master-next-1.9</option>
<option value='master-next2'>master-next2</option>
<option value='morty'>morty</option>
<option value='pyro'>pyro</option>
<option value='thud'>thud</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Mirror of openembedded-core</td><td class='sub right'>Multi-Tech Systems</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit/openembedded-core.git/'>summary</a><a href='/cgit/openembedded-core.git/refs/?id=6a3e57fcd3a172c9b2707510d65741734c98a143'>refs</a><a href='/cgit/openembedded-core.git/log/'>log</a><a href='/cgit/openembedded-core.git/tree/?id=6a3e57fcd3a172c9b2707510d65741734c98a143'>tree</a><a class='active' href='/cgit/openembedded-core.git/commit/?id=6a3e57fcd3a172c9b2707510d65741734c98a143'>commit</a><a href='/cgit/openembedded-core.git/diff/?id=6a3e57fcd3a172c9b2707510d65741734c98a143'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/openembedded-core.git/log/'>
<input type='hidden' name='id' value='6a3e57fcd3a172c9b2707510d65741734c98a143'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='6a3e57fcd3a172c9b2707510d65741734c98a143'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Richard Purdie &lt;richard.purdie@linuxfoundation.org&gt;</td><td class='right'>2011-06-10 12:56:29 +0100</td></tr>
<tr><th>committer</th><td>Richard Purdie &lt;richard.purdie@linuxfoundation.org&gt;</td><td class='right'>2011-06-10 12:56:29 +0100</td></tr>
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/cgit/openembedded-core.git/commit/?id=6a3e57fcd3a172c9b2707510d65741734c98a143'>6a3e57fcd3a172c9b2707510d65741734c98a143</a> (<a href='/cgit/openembedded-core.git/patch/?id=6a3e57fcd3a172c9b2707510d65741734c98a143'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/cgit/openembedded-core.git/tree/?id=6a3e57fcd3a172c9b2707510d65741734c98a143'>b00803dd7a3ca343ad01553d86b80ff2dd6945d0</a></td></tr>
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/cgit/openembedded-core.git/commit/?id=c553b3934f45db8a6e77cfc7673787db3cc64f85'>c553b3934f45db8a6e77cfc7673787db3cc64f85</a> (<a href='/cgit/openembedded-core.git/diff/?id=6a3e57fcd3a172c9b2707510d65741734c98a143&amp;id2=c553b3934f45db8a6e77cfc7673787db3cc64f85'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/cgit/openembedded-core.git/snapshot/openembedded-core-6a3e57fcd3a172c9b2707510d65741734c98a143.tar.gz'>openembedded-core-6a3e57fcd3a172c9b2707510d65741734c98a143.tar.gz</a><br/><a href='/cgit/openembedded-core.git/snapshot/openembedded-core-6a3e57fcd3a172c9b2707510d65741734c98a143.tar.bz2'>openembedded-core-6a3e57fcd3a172c9b2707510d65741734c98a143.tar.bz2</a><br/><a href='/cgit/openembedded-core.git/snapshot/openembedded-core-6a3e57fcd3a172c9b2707510d65741734c98a143.zip'>openembedded-core-6a3e57fcd3a172c9b2707510d65741734c98a143.zip</a><br/></td></tr></table>
<div class='commit-subject'>Revert "gcc: rebase the patch to avoid patch rejection"</div><div class='commit-msg'>This reverts commit c553b3934f45db8a6e77cfc7673787db3cc64f85.

This change clearly breaks builds since subsequent patches
depend on changes this patch removes. Not sure what's going
on here but this change isn't correct.
</div><div class='diffstat-header'><a href='/cgit/openembedded-core.git/diff/?id=6a3e57fcd3a172c9b2707510d65741734c98a143'>Diffstat</a></div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/openembedded-core.git/diff/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0060-be.po-da.po-de.po-el.po-es.po-fi.po-fr.po-id.po-ja.p.patch?id=6a3e57fcd3a172c9b2707510d65741734c98a143'>meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0060-be.po-da.po-de.po-el.po-es.po-fi.po-fr.po-id.po-ja.p.patch</a></td><td class='right'>161900</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 98.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1 files changed, 159525 insertions, 2375 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0060-be.po-da.po-de.po-el.po-es.po-fi.po-fr.po-id.po-ja.p.patch b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0060-be.po-da.po-de.po-el.po-es.po-fi.po-fr.po-id.po-ja.p.patch<br/>index b4c42c731d..82d3cdb53e 100644<br/>--- a/<a href='/cgit/openembedded-core.git/tree/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0060-be.po-da.po-de.po-el.po-es.po-fi.po-fr.po-id.po-ja.p.patch?id=c553b3934f45db8a6e77cfc7673787db3cc64f85'>meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0060-be.po-da.po-de.po-el.po-es.po-fi.po-fr.po-id.po-ja.p.patch</a><br/>+++ b/<a href='/cgit/openembedded-core.git/tree/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0060-be.po-da.po-de.po-el.po-es.po-fi.po-fr.po-id.po-ja.p.patch?id=6a3e57fcd3a172c9b2707510d65741734c98a143'>meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0060-be.po-da.po-de.po-el.po-es.po-fi.po-fr.po-id.po-ja.p.patch</a></div>