Author: mlandres Date: Fri Feb 20 13:23:12 2009 New Revision: 55643 URL: http://svn.opensuse.org/viewcvs/yast?rev=55643&view=rev Log: - Removed fragile test for service being modified. Leave it up to libzypp to decide wich actions must be performed when saving a service. (bnc#476418) Modified: branches/SuSE-Code-11-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-Branch/pkg-bindings/src/ServiceManager.cc Modified: branches/SuSE-Code-11-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindings/VERSION?rev=55643&r1=55642&r2=55643&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/VERSION Fri Feb 20 13:23:12 2009 @@ -1 +1 @@ -2.17.35 +2.17.36 Modified: branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes?rev=55643&r1=55642&r2=55643&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Fri Feb 20 13:23:12 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 20 13:16:39 CET 2009 - ma@suse.de + +- Removed fragile test for service being modified. Leave it up to libzypp + to decide wich actions must be performed when saving a service. (bnc#476418) +- 2.17.36 + +------------------------------------------------------------------- Wed Jan 28 14:11:58 CET 2009 - lslezak@suse.cz - Fixed Pkg::SetSolverFlags() function - properly set @@ -54,7 +61,7 @@ - honor the download area when downloading signed/digested files (do not download the files to the RAM disk during installation), remove the downloaded files in Pkg::SourceReleaseAll() to - release not needed files (bnc#449564) + release not needed files (bnc#449564) - 2.17.29 ------------------------------------------------------------------- @@ -82,7 +89,7 @@ Fri Nov 7 14:58:14 CET 2008 - lslezak@suse.cz - Pkg::SourceProvideSignedFile() has been renamed to - Pkg::SourceProvideDigestedFile(), added new + Pkg::SourceProvideDigestedFile(), added new Pkg::SourceProvideSignedFile() to dowload signed files (like "/content") (bnc#409927) - 2.17.25 @@ -314,7 +321,7 @@ ------------------------------------------------------------------- Thu Aug 7 17:13:38 CEST 2008 - ma@suse.de -- Adapt to new product handling. +- Adapt to new product handling. - 2.17.5 ------------------------------------------------------------------- Modified: branches/SuSE-Code-11-Branch/pkg-bindings/src/ServiceManager.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindings/src/ServiceManager.cc?rev=55643&r1=55642&r2=55643&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/src/ServiceManager.cc (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/src/ServiceManager.cc Fri Feb 20 13:23:12 2009 @@ -285,34 +285,21 @@ DBG << "Known Service: " << s_known << std::endl; DBG << "Stored Service: " << s_stored << std::endl; - bool modified = (s_stored.url() != s_known.url() - || s_stored.name() != s_known.name() - || s_stored.enabled() != s_known.enabled() - || s_stored.autorefresh() != s_known.autorefresh() - ); + std::string orig_alias(s_known.origAlias()); - if (modified) - { - std::string orig_alias(s_known.origAlias()); - - y2internal("orig_alias: %s", orig_alias.c_str()); + y2internal("orig_alias: %s", orig_alias.c_str()); - // the old alias is empty for new services - if (orig_alias.empty()) - { - y2milestone("Adding new service %s", alias.c_str()); - // add the service - repomgr.addService(s_known); - } - else - { - y2milestone("Saving service %s", alias.c_str()); - // use the old alias - repomgr.modifyService(orig_alias, s_known); - } + // the old alias is empty for new services + if (orig_alias.empty()) + { + y2milestone("Adding new service %s", alias.c_str()); + // add the service + repomgr.addService(s_known); } else { - y2milestone("Service %s has not been modified, not saving", alias.c_str()); + y2milestone("Saving service %s", alias.c_str()); + // use the old alias + repomgr.modifyService(orig_alias, s_known); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org