From e59cbb93edc77cebfffa0d105920665c12d7f114 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A1n=20Kupec?= Date: Sat, 30 Jan 2010 13:59:26 +0100 Subject: [PATCH] fixed ignored .arch (bnc #561294) --- src/install.cc | 3 ++- src/utils/misc.cc | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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; } -- 2.7.4