Author: schubi2 Date: Thu Jul 17 12:26:05 2008 New Revision: 10607 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10607&view=rev Log: renamed parallelInstalled by multiversion Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp.conf trunk/libzypp/zypp/ZConfig.cc trunk/libzypp/zypp/ZConfig.h trunk/libzypp/zypp/sat/Solvable.cc trunk/libzypp/zypp/solver/detail/SATResolver.cc Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=10607&r1=10606&r2=10607&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Jul 17 12:26:05 2008 @@ -2,7 +2,7 @@ Thu Jul 17 09:49:40 CEST 2008 - schubi@suse.de - Allow parallel installation of packages which have been defined - in zypp.conf (parameter "parallelInstallable") Fate #302050 + in zypp.conf (parameter "multiversion") Fate #302050 - Additional check for broken system. (defined in zypp.conv: solver.checkSystemFile) - revision 10600 Modified: trunk/libzypp/zypp.conf URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp.conf?rev=10607&r1=10606&r2=10607&view=diff ============================================================================== --- trunk/libzypp/zypp.conf (original) +++ trunk/libzypp/zypp.conf Thu Jul 17 12:26:05 2008 @@ -194,9 +194,10 @@ # solver.checkSystemFile = /etc/zypp/systemCheck ## -## Packages which are parallel installable. +## Packages which are parallel installable with +## diffent versions ## -# parallelInstallable = kernel-default,kernel-smp +# multiversion = kernel-default,kernel-smp ## ## Path to locks file. If not exist then is create. Modified: trunk/libzypp/zypp/ZConfig.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.cc?rev=10607&r1=10606&r2=10607&view=diff ============================================================================== --- trunk/libzypp/zypp/ZConfig.cc (original) +++ trunk/libzypp/zypp/ZConfig.cc Thu Jul 17 12:26:05 2008 @@ -249,13 +249,13 @@ { solver_checkSystemFile = Pathname(value); } - else if ( entry == "parallelInstallable" ) + else if ( entry == "multiversion" ) { - std::liststd::string parallel; - str::split( value, back_inserter(parallel), ", \t" ); - for ( std::list<string>::const_iterator it = parallel.begin(); - it != parallel.end(); it++) { - parallelInstallable.insert (IdString(*it)); + std::liststd::string multi; + str::split( value, back_inserter(multi), ", \t" ); + for ( std::list<string>::const_iterator it = multi.begin(); + it != multi.end(); it++) { + multiversion.insert (IdString(*it)); } } else if ( entry == "locksfile.path" ) @@ -335,7 +335,7 @@ bool solver_onlyRequires; Pathname solver_checkSystemFile; - std::set<IdString> parallelInstallable; + std::set<IdString> multiversion; bool apply_locks_file; @@ -519,14 +519,14 @@ { return _pimpl->solver_checkSystemFile; } - std::set<IdString> ZConfig::parallelInstallable() const - { return _pimpl->parallelInstallable; } + std::set<IdString> ZConfig::multiversion() const + { return _pimpl->multiversion; } - void ZConfig::addParallelInstallable(std::string &name) - { _pimpl->parallelInstallable.insert(IdString(name)); } + void ZConfig::addMultiversion(std::string &name) + { _pimpl->multiversion.insert(IdString(name)); } - bool ZConfig::removeParallelInstallable(std::string &name) - { return _pimpl->parallelInstallable.erase(IdString(name)); } + bool ZConfig::removeMultiversion(std::string &name) + { return _pimpl->multiversion.erase(IdString(name)); } bool ZConfig::apply_locks_file() const { Modified: trunk/libzypp/zypp/ZConfig.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.h?rev=10607&r1=10606&r2=10607&view=diff ============================================================================== --- trunk/libzypp/zypp/ZConfig.h (original) +++ trunk/libzypp/zypp/ZConfig.h Thu Jul 17 12:26:05 2008 @@ -184,12 +184,12 @@ Pathname solver_checkSystemFile() const; /** - * Packages which can be installed parallel. + * Packages which can be installed parallel with different versions * Returning a set of package names (IdString) */ - std::set<IdString> parallelInstallable() const; - void addParallelInstallable(std::string &name); - bool removeParallelInstallable(std::string &name); + std::set<IdString> multiversion() const; + void addMultiversion(std::string &name); + bool removeMultiversion(std::string &name); /** * Path where zypp can find or create lock file (configPath()/locks) Modified: trunk/libzypp/zypp/sat/Solvable.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Solvable.cc?rev=10607&r1=10606&r2=10607&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/Solvable.cc (original) +++ trunk/libzypp/zypp/sat/Solvable.cc Thu Jul 17 12:26:05 2008 @@ -321,8 +321,8 @@ bool Solvable::installOnly() const { - std::set<IdString> parallel = ZConfig::instance().parallelInstallable(); - if (parallel.find(ident()) != parallel.end()) + std::set<IdString> multiversion = ZConfig::instance().multiversion(); + if (multiversion.find(ident()) != multiversion.end()) return true; return false; } Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATResolver.cc?rev=10607&r1=10606&r2=10607&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Thu Jul 17 12:26:05 2008 @@ -611,8 +611,8 @@ queue_push( &(_jobQueue), id ); } - // Add rules for parallel installable resolvables - std::set<IdString> parallel = ZConfig::instance().parallelInstallable(); + // Add rules for parallel installable resolvables with different versions + std::set<IdString> parallel = ZConfig::instance().multiversion(); for (std::set<IdString>::const_iterator it = parallel.begin(); it != parallel.end(); ++it) { queue_push( &(_jobQueue), SOLVER_NOOBSOLETES_SOLVABLE_NAME ); queue_push( &(_jobQueue), it->id() ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org