renamed parallelInstalled by multiversion

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 79f9f35a1697c582969afb74ecf04a0e8701e66f..ba189a360637f1a5f1b24370ad6bfd8406e7cbf4 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -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 

diff --git a/zypp.conf b/zypp.conf
index 23b32d3622685eeb03f29338cd83a0e207f95a66..b75bb510eed76106e5311db35ccc8804b3cf6bce 100644 (file)
--- a/zypp.conf
+++ b/zypp.conf
@@ -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.

diff --git a/zypp/ZConfig.cc b/zypp/ZConfig.cc
index bc59fe7686007698c4112f7e1624149bb075ae04..b3f05a5056219236e395512607a35e3c460caed3 100644 (file)
--- a/zypp/ZConfig.cc
+++ b/zypp/ZConfig.cc
@@ -249,13 +249,13 @@ namespace zypp
                 {
                   solver_checkSystemFile = Pathname(value);
                 }
-                else if ( entry == "parallelInstallable" )
+                else if ( entry == "multiversion" )
                 {
-                 std::list<std::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::list<std::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 @@ namespace zypp
     bool solver_onlyRequires;
     Pathname solver_checkSystemFile;
       
-    std::set<IdString> parallelInstallable;  
+    std::set<IdString> multiversion;  
 
     bool apply_locks_file;
 
@@ -519,14 +519,14 @@ namespace zypp
   { 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
   {

diff --git a/zypp/ZConfig.h b/zypp/ZConfig.h
index 7ec7727d0a6d160b950f2f192526d51f7f512843..c639093b43e07fb4573779d401fe2d01b35def7c 100644 (file)
--- a/zypp/ZConfig.h
+++ b/zypp/ZConfig.h
@@ -184,12 +184,12 @@ namespace zypp
       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)

diff --git a/zypp/sat/Solvable.cc b/zypp/sat/Solvable.cc
index e4bfbeb3a39a17aaa03047e1b2ac83caad382a0a..fa9622f0e7b3f24ec9ec034c74005aaf9891934a 100644 (file)
--- a/zypp/sat/Solvable.cc
+++ b/zypp/sat/Solvable.cc
@@ -321,8 +321,8 @@ namespace zypp
 
     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;
     }

diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc
index 0ee4f4525de8582c6be5490ea4f60b313321aa08..63eb5c29952e0e643c41690cecb764c3875b791f 100644 (file)
--- a/zypp/solver/detail/SATResolver.cc
+++ b/zypp/solver/detail/SATResolver.cc
@@ -611,8 +611,8 @@ SATResolver::solverInit(const PoolItemList & weakItems)
         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() );