Author: lslezak Date: Mon Jun 27 17:08:19 2011 New Revision: 64606 URL: http://svn.opensuse.org/viewcvs/yast?rev=64606&view=rev Log: - ignore deleted repositories when checking uniqueness of an alias (bnc#702399) - 2.21.4 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Source_Misc.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=64606&r1=64605&r2=64606&view=diff ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Mon Jun 27 17:08:19 2011 @@ -1 +1 @@ -2.21.3 +2.21.4 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-bindings.changes?rev=64606&r1=64605&r2=64606&view=diff ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Mon Jun 27 17:08:19 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jun 27 15:04:18 UTC 2011 - lslezak@suse.cz + +- ignore deleted repositories when checking uniqueness of an alias + (bnc#702399) +- 2.21.4 + +------------------------------------------------------------------- Thu Jun 23 11:59:48 UTC 2011 - lslezak@suse.cz - fixed aborting autorefresh (bnc#691828) Modified: trunk/pkg-bindings/src/Source_Misc.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Misc.cc?rev=64606&r1=64605&r2=64606&view=diff ============================================================================== --- trunk/pkg-bindings/src/Source_Misc.cc (original) +++ trunk/pkg-bindings/src/Source_Misc.cc Mon Jun 27 17:08:19 2011 @@ -92,7 +92,7 @@ // search in loaded repositories for(RepoCont::const_iterator it = repos.begin(); it != repos.end() ; ++it) { - if ((*it)->repoInfo().alias() == alias) + if (!(*it)->isDeleted() && (*it)->repoInfo().alias() == alias) return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org