From 30a8fabe4b3f8311484c0465d577ba7a03f974c4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A1n=20Kupec?= <jkupec@suse.cz>
Date: Mon, 11 Oct 2010 13:47:21 +0200
Subject: [PATCH] Use VendorAttr::equivalent to compare vendors (bnc #605380)

---
 src/SolverRequester.cc |  6 ++++--
 src/Summary.cc         | 11 +++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/SolverRequester.cc b/src/SolverRequester.cc
index d4e1d85..dda49d8 100644
--- a/src/SolverRequester.cc
+++ b/src/SolverRequester.cc
@@ -163,8 +163,10 @@ void SolverRequester::install(const PackageSpec & pkg)
                 || pkg.parsed_cap.detail().hasArch()
                 || !_opts.from_repos.empty()
                 || !pkg.repo_alias.empty();
+
             // check vendor (since PoolItemBest does not do it)
-            bool changes_vendor = instobj->vendor() != (*sit)->vendor();
+            bool changes_vendor = ! VendorAttr::instance().equivalent(
+                instobj->vendor(), (*sit)->vendor());
 
             PoolItem best;
             if (userconstraints)
@@ -536,7 +538,7 @@ void SolverRequester::updateTo(
     }
 
     // update candidate has different vendor
-    if (highest->vendor() != installed->vendor())
+    if (!VendorAttr::instance().equivalent(highest->vendor(), installed->vendor()))
     {
       addFeedback(Feedback::UPD_CANDIDATE_CHANGES_VENDOR, pkg, selected, installed);
       DBG << "Newer object with different vendor exists: " << highest
diff --git a/src/Summary.cc b/src/Summary.cc
index 518df2c..1f44177 100644
--- a/src/Summary.cc
+++ b/src/Summary.cc
@@ -169,7 +169,7 @@ void Summary::readPool(const zypp::ResPool & pool)
             toupgrade[res->kind()].insert(rp);
             if (res->arch() != (*rmit)->arch())
               tochangearch[res->kind()].insert(rp);
-            if (res->vendor() != (*rmit)->vendor())
+            if (!VendorAttr::instance().equivalent(res->vendor(), (*rmit)->vendor()))
               tochangevendor[res->kind()].insert(rp);
           }
           // reinstall
@@ -179,7 +179,7 @@ void Summary::readPool(const zypp::ResPool & pool)
               tochangearch[res->kind()].insert(rp);
             else
               toreinstall[res->kind()].insert(rp);
-            if (res->vendor() != (*rmit)->vendor())
+            if (!VendorAttr::instance().equivalent(res->vendor(), (*rmit)->vendor()))
               tochangevendor[res->kind()].insert(rp);
           }
           // downgrade
@@ -188,7 +188,7 @@ void Summary::readPool(const zypp::ResPool & pool)
             todowngrade[res->kind()].insert(rp);
             if (res->arch() != (*rmit)->arch())
               tochangearch[res->kind()].insert(rp);
-            if (res->vendor() != (*rmit)->vendor())
+            if (!VendorAttr::instance().equivalent(res->vendor(), (*rmit)->vendor()))
               tochangevendor[res->kind()].insert(rp);
           }
 
@@ -405,9 +405,8 @@ void Summary::writeResolvableList(ostream & out, const ResPairSet & resolvables)
     }
     if (_viewop & SHOW_VENDOR)
     {
-      if (resit->first && resit->first->vendor() != resit->second->vendor())
-        tr << resit->first->vendor() + " -> " +
-              resit->second->vendor();
+      if (resit->first && ! VendorAttr::instance().equivalent(resit->first->vendor(), resit->second->vendor()))
+        tr << resit->first->vendor() + " -> " + resit->second->vendor();
       else
         tr << resit->second->vendor();
     }
-- 
2.7.4