Fix another static initialization problem

Settings were never saved since the URL comparison failed. This
fixes various zypper authentication issues on Ubuntu 11.10.

diff --git a/zypp/media/CredentialManager.cc b/zypp/media/CredentialManager.cc
index c8a00ec93915ed48de9f9abb619c3e086b3ceb9f..4ff8dc1626f0fcdc95591d0aa4bd49c7d9393e4b 100644 (file)
--- a/zypp/media/CredentialManager.cc
+++ b/zypp/media/CredentialManager.cc
@@ -39,16 +39,16 @@ namespace zypp
   //
   //////////////////////////////////////////////////////////////////////
 
-  const url::ViewOption AuthDataComparator::vopt =
-    url::ViewOption::DEFAULTS
-    - url::ViewOption::WITH_USERNAME
-    - url::ViewOption::WITH_PASSWORD
-    - url::ViewOption::WITH_QUERY_STR;
-
   bool
   AuthDataComparator::operator()(
       const AuthData_Ptr & lhs, const AuthData_Ptr & rhs)
   {
+    static const url::ViewOption vopt =
+        url::ViewOption::DEFAULTS
+        - url::ViewOption::WITH_USERNAME
+        - url::ViewOption::WITH_PASSWORD
+        - url::ViewOption::WITH_QUERY_STR;
+
     if (lhs->username() != rhs->username())
       return true;
 

diff --git a/zypp/media/CredentialManager.h b/zypp/media/CredentialManager.h
index 5ebcf769ee8ce2236649a1b910db9839551526bf..19018dfe4014bb13ee4b7b0a912d528bb063d252 100644 (file)
--- a/zypp/media/CredentialManager.h
+++ b/zypp/media/CredentialManager.h
@@ -48,7 +48,6 @@ namespace zypp
   // comparator for CredentialSet
   struct AuthDataComparator
   {
-    static const url::ViewOption vopt;
     bool operator()(const AuthData_Ptr & lhs, const AuthData_Ptr & rhs);
   };