fixed repeated service save problem (bnc#873683#c7)

- 3.1.8
yast · Apr 15, 2014 · f714260 · f714260
1 parent a23afaa
commit f714260
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 9 deletions.
diff --git a/package/yast2-pkg-bindings-devel-doc.spec b/package/yast2-pkg-bindings-devel-doc.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-pkg-bindings-devel-doc
-Version:        3.1.7
+Version:        3.1.8
 Release:        0
 License:        GPL-2.0
 Group:          Documentation/HTML

diff --git a/package/yast2-pkg-bindings.changes b/package/yast2-pkg-bindings.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 15 14:48:45 UTC 2014 - lslezak@suse.cz
+
+- fixed repeated service save problem (bnc#873683#c7)
+- 3.1.8
+
 -------------------------------------------------------------------
 Wed Apr  2 15:11:58 UTC 2014 - lslezak@suse.cz
 

diff --git a/package/yast2-pkg-bindings.spec b/package/yast2-pkg-bindings.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-pkg-bindings
-Version:        3.1.7
+Version:        3.1.8
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/PkgService.cc b/src/PkgService.cc
@@ -54,3 +54,7 @@ std::string PkgService::origAlias() const
     return _old_alias;
 }
 
+void PkgService::setOrigAlias(const std::string& orig_alias)
+{
+    _old_alias = orig_alias;
+}
diff --git a/src/PkgService.h b/src/PkgService.h
@@ -40,6 +40,7 @@ class PkgService : public zypp::ServiceInfo
 
 	std::string origAlias() const;
 
+        void setOrigAlias(const std::string& orig_alias);
 
     private:
 

diff --git a/src/ServiceManager.cc b/src/ServiceManager.cc
@@ -53,7 +53,7 @@ void ServiceManager::LoadServices(const zypp::RepoManager &repomgr)
     }
 }
 
-void ServiceManager::SaveServices(zypp::RepoManager &repomgr) const
+void ServiceManager::SaveServices(zypp::RepoManager &repomgr)
 {
     for_ (it, _known_services.begin(), _known_services.end())
     {
@@ -75,9 +75,9 @@ void ServiceManager::SaveServices(zypp::RepoManager &repomgr) const
     }
 }
 
-bool ServiceManager::SaveService(const std::string &alias, zypp::RepoManager &repomgr) const
+bool ServiceManager::SaveService(const std::string &alias, zypp::RepoManager &repomgr)
 {
-    PkgServices::const_iterator serv_it = _known_services.find(alias);
+    PkgServices::iterator serv_it = _known_services.find(alias);
 
     if (serv_it == _known_services.end())
     {
@@ -287,7 +287,7 @@ ServiceManager::Services::size_type ServiceManager::size() const
     return _known_services.size();
 }
 
-void ServiceManager::SavePkgService(const PkgService &s_known, zypp::RepoManager &repomgr) const
+void ServiceManager::SavePkgService(PkgService &s_known, zypp::RepoManager &repomgr) const
 {
     const std::string alias(s_known.alias());
     const zypp::ServiceInfo s_stored = repomgr.getService(alias);
@@ -305,6 +305,8 @@ void ServiceManager::SavePkgService(const PkgService &s_known, zypp::RepoManager
         y2milestone("Adding new service %s", alias.c_str());
         // add the service
         repomgr.addService(s_known);
+        // set the old alias to properly save it next time
+        s_known.setOrigAlias(alias);
     }
     else
     {

diff --git a/src/ServiceManager.h b/src/ServiceManager.h
@@ -42,9 +42,9 @@ class ServiceManager
 
 	void LoadServices(const zypp::RepoManager &repomgr);
 
-	void SaveServices(zypp::RepoManager &repomgr) const;
+	void SaveServices(zypp::RepoManager &repomgr);
 
-	bool SaveService(const std::string &alias, zypp::RepoManager &repomgr) const;
+	bool SaveService(const std::string &alias, zypp::RepoManager &repomgr);
 
 	bool AddService(const std::string &alias, const std::string &url);
 
@@ -70,7 +70,7 @@ class ServiceManager
     private:
 
 	// internal helper method
-	void SavePkgService(const PkgService &s_known, zypp::RepoManager &repomgr) const;
+	void SavePkgService(PkgService &s_known, zypp::RepoManager &repomgr) const;
 
 	// current alias -> PkgService for convenient search by alias
 	typedef std::map<std::string, PkgService> PkgServices;