From: Ján Kupec <jkupec@suse.cz>
Date: Sat, 30 Jan 2010 12:59:26 +0000 (+0100)
Subject: fixed ignored .arch (bnc #561294)
X-Git-Tag: 1.2.17~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e59cbb93edc77cebfffa0d105920665c12d7f114;p=platform%2Fupstream%2Fzypper.git

fixed ignored .arch (bnc #561294)
---

diff --git a/src/install.cc b/src/install.cc
index 324b05a..96886dd 100755
--- a/src/install.cc
+++ b/src/install.cc
@@ -642,7 +642,8 @@ void install_remove(Zypper & zypper,
 
 
     // is version specified?
-    by_capability = str.find_first_of("=<>") != string::npos;
+    if (!by_capability)
+      by_capability = str.find_first_of("=<>") != string::npos;
 
     // try to find foo-bar-1.2.3-2
     if (!by_capability && str.find('-') != string::npos)
diff --git a/src/utils/misc.cc b/src/utils/misc.cc
index 42d2e0e..0068db5 100644
--- a/src/utils/misc.cc
+++ b/src/utils/misc.cc
@@ -329,8 +329,11 @@ static string preparse_cap_str(const string & capstr, const string & arch)
     }
     if (!arch.empty())
       new_capstr.insert(op_pos, "." + arch);
-    DBG << "new capstr: " << new_capstr << endl;
   }
+  else if (!arch.empty())
+    new_capstr += "." + arch;
+
+  DBG << "new capstr: " << new_capstr << endl;
 
   return new_capstr;
 }