Author: lslezak Date: Thu Jan 26 15:11:08 2012 New Revision: 67304 URL: http://svn.opensuse.org/viewcvs/yast?rev=67304&view=rev Log: - fixed saving additional repositories added by registration (a regression introduced by bnc#724449 fix) (bnc#742033) - 2.17.57 Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Service.cc branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Source_Create.cc branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Source_Save.cc branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/YRepo.cc branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/YRepo.h Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION?rev=67304&r1=67303&r2=67304&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION Thu Jan 26 15:11:08 2012 @@ -1 +1 @@ -2.17.56 +2.17.57 Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes?rev=67304&r1=67303&r2=67304&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Thu Jan 26 15:11:08 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 26 11:50:25 UTC 2012 - lslezak@suse.cz + +- fixed saving additional repositories added by registration + (a regression introduced by bnc#724449 fix) (bnc#742033) +- 2.17.57 + +------------------------------------------------------------------- Tue Jan 3 16:58:42 UTC 2012 - lslezak@suse.cz - check if downloading optional file really succeeded (bnc#736693) Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Service.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Service.cc?rev=67304&r1=67303&r2=67304&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Service.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Service.cc Thu Jan 26 15:11:08 2012 @@ -394,7 +394,8 @@ { repos[idx]->repoInfo() = repomanager.getRepositoryInfo(info.alias()); } - else + // do not remove repos which have not been saved yet (freshly added) + else if (!repo->isAdded()) { y2milestone("Repository %s has been removed, unloading it", (info.alias().c_str())); RemoveResolvablesFrom(repo); Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Source_Create.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Source_Create.cc?rev=67304&r1=67303&r2=67304&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Source_Create.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Source_Create.cc Thu Jan 26 15:11:08 2012 @@ -314,7 +314,11 @@ prg.toMax(); } - repos.push_back(new YRepo(repo)); + + YRepo_Ptr new_repo = new YRepo(repo); + new_repo->setAdded(); + + repos.push_back(new_repo); y2milestone("Added source '%s': '%s', enabled: %s, autorefresh: %s", repo.alias().c_str(), @@ -511,7 +515,10 @@ repo.setPackagesPath(repomanager.packagesPath(repo)); - repos.push_back(new YRepo(repo)); + YRepo_Ptr new_repo = new YRepo(repo); + new_repo->setAdded(); + + repos.push_back(new_repo); // the new source is at the end of the list return YCPInteger(repos.size() - 1); Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Source_Save.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Source_Save.cc?rev=67304&r1=67303&r2=67304&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Source_Save.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Source_Save.cc Thu Jan 26 15:11:08 2012 @@ -220,6 +220,12 @@ y2milestone("Adding repository '%s'", current_alias.c_str()); repomanager.addRepository((*it)->repoInfo()); } + + if (!(*it)->isAdded()) + { + y2milestone("Resetting added flag for repository %s", current_alias.c_str()); + (*it)->resetAdded(); + } } catch (zypp::Exception & excpt) { Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/YRepo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/YRepo.cc?rev=67304&r1=67303&r2=67304&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/YRepo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/YRepo.cc Thu Jan 26 15:11:08 2012 @@ -32,7 +32,7 @@ IMPL_PTR_TYPE(YRepo); YRepo::YRepo(zypp::RepoInfo & repo) - : _repo(repo), _deleted(false), _loaded(false) + : _repo(repo), _deleted(false), _added(false), _loaded(false) {} YRepo::~YRepo() Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/YRepo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/YRepo.h?rev=67304&r1=67303&r2=67304&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/YRepo.h (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/YRepo.h Thu Jan 26 15:11:08 2012 @@ -39,6 +39,7 @@ zypp::RepoInfo _repo; zypp::MediaSetAccess_Ptr _maccess; bool _deleted; + bool _added; bool _loaded; YRepo() {} @@ -54,6 +55,10 @@ bool isDeleted() {return _deleted;} void setDeleted() {_deleted = true;} + bool isAdded() {return _added;} + void setAdded() {_added = true;} + void resetAdded() {_added = false;} + bool isLoaded() {return _loaded;} void setLoaded() {_loaded = true;} void resetLoaded() {_loaded = false;} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org