- merge Stano's patch to keep downloaded rpms

diff --git a/zypp/Fetcher.cc b/zypp/Fetcher.cc
index 31e49034e5882f15b31c95daa51f36954e0feb43..fd444aca624c91022e17e7a9bf4b3ed937908cd9 100644 (file)
--- a/zypp/Fetcher.cc
+++ b/zypp/Fetcher.cc
@@ -139,8 +139,13 @@ namespace zypp
       {
         // does the current file exists in the current cache?
         Pathname cached_file = *it_cache + (*it_res)->location.filename();
+       
+       MIL << "Trying cached file: " << cached_file << endl;
+       
         if ( PathInfo( cached_file ).isExist() )
         {
+         MIL << "File exist, testing checksum " << (*it_res)->location.checksum() << endl;
+
           // check the checksum
           if ( is_checksum( cached_file, (*it_res)->location.checksum() ) && (! (*it_res)->location.checksum().empty() ) )
           {
@@ -151,16 +156,20 @@ namespace zypp
 
             // replicate the complete path in the target directory
             Pathname dest_full_path = dest_dir + (*it_res)->location.filename();
-            if ( assert_dir( dest_full_path.dirname() ) != 0 )
-              ZYPP_THROW( Exception("Can't create " + dest_full_path.dirname().asString()));
+           
+           if( dest_full_path != cached_file )
+           {
+              if ( assert_dir( dest_full_path.dirname() ) != 0 )
+                ZYPP_THROW( Exception("Can't create " + dest_full_path.dirname().asString()));
 
-            if ( filesystem::copy(cached_file, dest_full_path ) != 0 )
-            { //copy_file2dir
-              //ZYPP_THROW(SourceIOException("Can't copy " + cached_file.asString() + " to " + destination.asString()));
-              ERR << "Can't copy " << cached_file + " to " + dest_dir << endl;
-              // try next cache
-              continue;
-            }
+              if ( filesystem::copy(cached_file, dest_full_path ) != 0 )
+              { //copy_file2dir
+                //ZYPP_THROW(SourceIOException("Can't copy " + cached_file.asString() + " to " + destination.asString()));
+                ERR << "Can't copy " << cached_file + " to " + dest_dir << endl;
+                // try next cache
+                continue;
+              }
+           }
 
             got_from_cache = true;
             break;
@@ -170,6 +179,8 @@ namespace zypp
 
       if ( ! got_from_cache )
       {
+        MIL << "Not found in cache, downloading" << endl;
+       
         // try to get the file from the net
         try
         {

diff --git a/zypp/RepoInfo.cc b/zypp/RepoInfo.cc
index 72579734ca7104135c87caff26f3d02586c5613a..66473b91554e38ffaa6eb167a875afb2fa7eb76c 100644 (file)
--- a/zypp/RepoInfo.cc
+++ b/zypp/RepoInfo.cc
@@ -33,6 +33,7 @@ namespace zypp
       : enabled (false),
         autorefresh(false),
         gpgcheck(true),
+       keeppackages(false),
         type(repo::RepoType::NONE_e)
     {}
 
@@ -44,6 +45,7 @@ namespace zypp
     bool enabled;
     bool autorefresh;
     bool gpgcheck;
+    bool keeppackages;
     Url gpgkey_url;
     repo::RepoType type;
     Url mirrorlist_url;
@@ -54,6 +56,7 @@ namespace zypp
     std::string name;
     Pathname filepath;
     Pathname metadatapath;
+    Pathname packagespath;
   public:
 
   private:
@@ -185,6 +188,18 @@ namespace zypp
     return *this;
   }
 
+  RepoInfo & RepoInfo::setPackagesPath( const Pathname &path )
+  {
+    _pimpl->packagespath = path;
+    return *this;
+  }
+
+  RepoInfo & RepoInfo::setKeepPackages( bool keep )
+  {
+    _pimpl->keeppackages = keep;
+    return *this;
+  }
+
   bool RepoInfo::enabled() const
   { return _pimpl->enabled; }
 
@@ -217,6 +232,9 @@ namespace zypp
   Pathname RepoInfo::metadataPath() const
   { return _pimpl->metadatapath; }
 
+  Pathname RepoInfo::packagesPath() const
+  { return _pimpl->packagespath; }
+
   repo::RepoType RepoInfo::type() const
   { return _pimpl->type; }
 
@@ -264,6 +282,9 @@ namespace zypp
   bool RepoInfo::baseUrlsEmpty() const
   { return _pimpl->baseUrls.empty(); }
 
+  bool RepoInfo::keepPackages() const
+  { return _pimpl->keeppackages; }
+
   std::ostream & RepoInfo::dumpOn( std::ostream & str ) const
   {
     str << "--------------------------------------" << std::endl;
@@ -281,6 +302,7 @@ namespace zypp
     str << "- autorefresh : " << autorefresh() << std::endl;
     str << "- gpgcheck : " << gpgCheck() << std::endl;
     str << "- gpgkey : " << gpgKeyUrl() << std::endl;
+    str << "- keeppackages : " << keepPackages() << std::endl;
 
     return str;
   }
@@ -312,6 +334,8 @@ namespace zypp
     str << "gpgcheck=" << (gpgCheck() ? "1" : "0") << endl;
     if ( ! (gpgKeyUrl().asString().empty()) )
       str << "gpgkey=" <<gpgKeyUrl() << endl;
+      
+    str << "keeppackages=" << keepPackages() << endl;
 
     return str;
   }

diff --git a/zypp/RepoInfo.h b/zypp/RepoInfo.h
index d384e5483ffec9a5d8aa9b7f6f6a9990fd3a0574..07bc316f8787b5e7fd71dd232cf83c92cde35c20 100644 (file)
--- a/zypp/RepoInfo.h
+++ b/zypp/RepoInfo.h
@@ -188,6 +188,11 @@ namespace zypp
      */
      Pathname metadataPath() const;
 
+     /**
+     * \short Path where this repo packages are cached
+     */
+     Pathname packagesPath() const;
+
      /**
      * \short Whether to check or not this repository with gpg
      *
@@ -208,6 +213,11 @@ namespace zypp
      */
      Url gpgKeyUrl() const;
 
+    /**
+     * \short Whether to keep the packages downloaded from this repository will be kept in local cache
+     */
+    bool keepPackages() const;
+
     /**
      * Add a base url. \see baseUrls
      * \param url The base url for the repository.
@@ -284,6 +294,13 @@ namespace zypp
      */
     RepoInfo & setMetadataPath( const Pathname &path );
 
+    /**
+     * \short set the path where the local packages are stored
+     *
+     * \param path directory path
+     */
+    RepoInfo & setPackagesPath( const Pathname &path );
+
     /**
      * \short Whether to check or not this repository with gpg
      *
@@ -305,6 +322,17 @@ namespace zypp
      *
      */
     RepoInfo & setGpgKeyUrl( const Url &gpgkey );
+    
+    /**
+     * \short Set if the packaqes downloaded from this repository will be kept in local cache
+     *
+     * If the setting is true, all downloaded packages from this repository will be 
+     * copied to the local raw cache.
+     *
+     * \param keep true (keep the downloaded packages) or false (delete them after installation)
+     *
+     */
+    RepoInfo & setKeepPackages( bool keep );
 
     /**
      * Write a human-readable representation of this RepoInfo object

diff --git a/zypp/RepoManager.cc b/zypp/RepoManager.cc
index 1a793cc372a9c561d23d15b40e809e2df007641f..fb12f0a769931cacd264dba85309b60757865682 100644 (file)
--- a/zypp/RepoManager.cc
+++ b/zypp/RepoManager.cc
@@ -67,6 +67,7 @@ namespace zypp
   {
     repoCachePath    = ZConfig::instance().repoCachePath();
     repoRawCachePath = ZConfig::instance().repoMetadataPath();
+    repoPackagesCachePath = ZConfig::instance().repoPackagesPath();
     knownReposPath   = ZConfig::instance().knownReposPath();
   }
 
@@ -197,6 +198,15 @@ namespace zypp
     return opt.repoRawCachePath + info.alias();
   }
 
+  /**
+   * \short Calculates the packages cache path for a repository
+   */
+  static Pathname packagescache_path_for_repoinfo( const RepoManagerOptions &opt, const RepoInfo &info )
+  {
+    assert_alias(info);
+    return opt.repoPackagesCachePath + info.alias();
+  }
+
   ///////////////////////////////////////////////////////////////////
   //
   //   CLASS NAME : RepoManager::Impl
@@ -277,6 +287,10 @@ namespace zypp
         // set the metadata path for the repo
         Pathname metadata_path = rawcache_path_for_repoinfo(_pimpl->options, (*it));
         (*it).setMetadataPath(metadata_path);
+       
+       // set the downloaded packages path for the repo
+       Pathname packages_path = packagescache_path_for_repoinfo(_pimpl->options, (*it));
+       (*it).setPackagesPath(packages_path);
       }
       return repos;
     }
@@ -599,10 +613,17 @@ namespace zypp
 
         // ok we have the metadata, now exchange
         // the contents
-        TmpDir oldmetadata( TmpDir::makeSibling( rawpath ) );
-        filesystem::rename( rawpath, oldmetadata.path() );
+       
+       // first, clean up the old rawcache metadata
+       // #FIXME       
+       // now, move the new metadata in
+       // #FIXME
+       
+        //TmpDir oldmetadata( TmpDir::makeSibling( rawpath ) );
+        //filesystem::rename( rawpath, oldmetadata.path() );
         // move the just downloaded there
-        filesystem::rename( tmpdir.path(), rawpath );
+        //filesystem::rename( tmpdir.path(), rawpath );
+
         // we are done.
         return;
       }

diff --git a/zypp/RepoManager.h b/zypp/RepoManager.h
index 2303461246e86df163a8cb5f8b4fd4acf53831d1..711c3ffd84313414be03d9ffeb42fd59fd2d5234 100644 (file)
--- a/zypp/RepoManager.h
+++ b/zypp/RepoManager.h
@@ -52,6 +52,7 @@ namespace zypp
 
     Pathname repoCachePath;
     Pathname repoRawCachePath;
+    Pathname repoPackagesCachePath;
     Pathname knownReposPath;
   };
 

diff --git a/zypp/ZConfig.cc b/zypp/ZConfig.cc
index 9e2ca91183e0d3d44efc55618d4b4cbd16d9c689..814db0b4446d495ea443b399ec1a69c702a3b483 100644 (file)
--- a/zypp/ZConfig.cc
+++ b/zypp/ZConfig.cc
@@ -216,6 +216,10 @@ namespace zypp
                 {
                   cfg_vendor_path = Pathname(value);
                 }
+                else if ( entry == "packagesdir" )
+                {
+                  cfg_packages_path = Pathname(value);
+                }
               }
             }
           }
@@ -249,6 +253,7 @@ namespace zypp
     Locale   cfg_textLocale;
 
     Pathname cfg_metadata_path;
+    Pathname cfg_packages_path;
     Pathname cfg_cache_path;
     Pathname cfg_known_repos_path;
     Pathname cfg_vendor_path;
@@ -347,6 +352,12 @@ namespace zypp
         ? Pathname("/var/cache/zypp/raw") : _pimpl->cfg_metadata_path );
   }
 
+  Pathname ZConfig::repoPackagesPath() const
+  {
+    return ( _pimpl->cfg_packages_path.empty()
+        ? Pathname("/var/cache/zypp/packages") : _pimpl->cfg_packages_path );
+  }
+
   Pathname ZConfig::repoCachePath() const
   {
     return ( _pimpl->cfg_cache_path.empty()

diff --git a/zypp/ZConfig.h b/zypp/ZConfig.h
index abb65287d7c49aa1de451b624103550135061af2..ef2a8bbff904b5c07f86598d2b17ea18038a76de 100644 (file)
--- a/zypp/ZConfig.h
+++ b/zypp/ZConfig.h
@@ -92,6 +92,11 @@ namespace zypp
        */
       Pathname repoMetadataPath() const;
 
+      /**
+       * Path where the repo packages are downloaded and kept.
+       */
+      Pathname repoPackagesPath() const;
+
       /**
        * Path where the processed cache is kept
        * (this is where zypp.db is located.

diff --git a/zypp/parser/RepoFileReader.cc b/zypp/parser/RepoFileReader.cc
index ff988347b70eef69569e8eaefc79e94a39d95366..4327511d5da539cbef70bb3fb2ce040855b48e83 100644 (file)
--- a/zypp/parser/RepoFileReader.cc
+++ b/zypp/parser/RepoFileReader.cc
@@ -69,6 +69,8 @@ namespace zypp
             info.setGpgKeyUrl( Url(it->second) );
           else if ( it->first == "gpgcheck" )
             info.setGpgCheck( it->second == "1" );
+         else if ( it->first == "keeppackages" )
+           info.setKeepPackages( it->second == "1" );
           else
             ERR << "Unknown attribute " << it->second << " ignored" << endl;
         }

diff --git a/zypp/repo/RepoProvideFile.cc b/zypp/repo/RepoProvideFile.cc
index 52a8f8d775dd6acfadb760fd315fcc9d82e16036..0ca120ce716f3d46b48a0881895c4958bc63c5ca 100644 (file)
--- a/zypp/repo/RepoProvideFile.cc
+++ b/zypp/repo/RepoProvideFile.cc
@@ -28,6 +28,7 @@
 #include "zypp/repo/SUSEMediaVerifier.h"
 #include "zypp/repo/RepoException.h"
 #include "zypp/FileChecker.h"
+#include "zypp/Fetcher.h"
 
 using std::endl;
 using std::set;
@@ -214,7 +215,12 @@ namespace zypp
         repo_excpt.remember(RepoException(_("No url in repository.")));
         ZYPP_THROW(repo_excpt);
       }
+
+      Fetcher fetcher;
+      fetcher.addCachePath( info.packagesPath() );
       
+      MIL << "Added cache path " << info.packagesPath() << endl;
+            
       for ( RepoInfo::urls_const_iterator it = info.baseUrlsBegin();
             it != info.baseUrlsEnd();
             /* incremented in the loop */ )
@@ -227,11 +233,17 @@ namespace zypp
               << "' from " << url << endl;
           shared_ptr<MediaSetAccess> access = _impl->mediaAccessForUrl(url);
           _impl->setVerifierForRepo(repo_r, access);
+         
+         fetcher.enqueue( loc_r );
+         
+         // FIXME: works for packages only
+         fetcher.start( info.packagesPath(), *access );
 
-          ManagedFile ret( access->provideFile(loc_r) );
+         // reached if no exception has been thrown, so this is the correct file
+          ManagedFile ret( info.packagesPath() + loc_r.filename() );
 
           std::string scheme( url.getScheme() );
-          if ( scheme == "http" || scheme == "https" || scheme == "ftp" )
+          if ( !info.keepPackages() )
           {
             ret.setDispose( filesystem::unlink );
           }