[yast-commit] r56443 - in /branches/SuSE-SLE-10-SP3-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Source.cc

Author: lslezak Date: Fri Mar 27 14:12:36 2009 New Revision: 56443 URL: http://svn.opensuse.org/viewcvs/yast?rev=56443&view=rev Log: - Fixed Pkg::SourceCreate() - make the new alias unique - timestamp alias uses 1 second granularity which might not be sufficient in AutoYast (bnc#406720) - 2.13.124 Modified: branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/VERSION branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Source.cc Modified: branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/VERSION?rev=56443&r1=56442&r2=56443&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/VERSION Fri Mar 27 14:12:36 2009 @@ -1 +1 @@ -2.13.123 +2.13.124 Modified: branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/package/yast2-pkg-bindings.changes?rev=56443&r1=56442&r2=56443&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Fri Mar 27 14:12:36 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Mar 27 13:57:53 CET 2009 - lslezak@suse.cz + +- Fixed Pkg::SourceCreate() - make the new alias unique - timestamp + alias uses 1 second granularity which might not be sufficient + in AutoYast (bnc#406720) +- 2.13.124 + +------------------------------------------------------------------- Wed Mar 25 13:41:30 CET 2009 - lslezak@suse.cz - Fixed Pkg::ResolvableProperties() - return `removed status for Modified: branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Source.cc?rev=56443&r1=56442&r2=56443&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Source.cc (original) +++ branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Source.cc Fri Mar 27 14:12:36 2009 @@ -25,6 +25,9 @@ //#include #include <iostream> +#include <sstream> +#include <algorithm> + #include #include @@ -1037,11 +1040,15 @@ bool alias_found = false; std::listzypp::SourceManager::SourceId ids = zypp::SourceManager::sourceManager()->allSources(); + // remember the existing aliases + std::liststd::string aliases; + for( std::listzypp::SourceManager::SourceId::iterator it = ids.begin(); it != ids.end(); ++it) { try { zypp::Source_Ref src = zypp::SourceManager::sourceManager()->findSource(*it); + aliases.push_back(src.alias()); if (src.alias() == newsrc.alias()) { @@ -1085,7 +1092,28 @@ alias += timestamp (); + // does the alias already exist? + if (std::find_if(aliases.begin(), aliases.end(), std::bind2nd(std::equal_tostd::string(), alias)) != aliases.end()) + { + // yes, make the alias unique (see bnc #406720) + int uniq_suffix = 0; + std::string new_alias; + + do + { + std::ostringstream os; + os << alias << '_' << uniq_suffix; + new_alias = os.str(); + uniq_suffix++; + } + while (std::find_if(aliases.begin(), aliases.end(), std::bind2nd(std::equal_tostd::string(), new_alias)) != aliases.end()); + + y2milestone("Make the new alias unique: '%s' -> '%s'", alias.c_str(), new_alias.c_str()); + alias = new_alias; + } + newsrc.setAlias( alias ); + y2milestone("Using time stamp '%s' as the alias", alias.c_str()); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org