Merge from master

diff --git a/zypp/repo/MediaInfoDownloader.cc b/zypp/repo/MediaInfoDownloader.cc
index f13db27..9c35864 100644 (file)
--- a/zypp/repo/MediaInfoDownloader.cc
+++ b/zypp/repo/MediaInfoDownloader.cc
@@ -27,7 +27,7 @@ void downloadMediaInfo( const Pathname &dest_dir,
                         const ProgressData::ReceiverFnc & progressrcv )
 {
   Fetcher fetcher;
-  fetcher.enqueue( OnMediaLocation().setFilename( "/media.1/media") );
+  fetcher.enqueue( OnMediaLocation("/media.1/media") );
   fetcher.start( dest_dir, media, progressrcv );
   // ready, go!
   fetcher.reset();

diff --git a/zypp/repo/cached/RepoImpl.cc b/zypp/repo/cached/RepoImpl.cc
index 7fd258f..62d7b6c 100644 (file)
--- a/zypp/repo/cached/RepoImpl.cc
+++ b/zypp/repo/cached/RepoImpl.cc
@@ -74,7 +74,6 @@ static int global_progress_handler(void* ptr)
   RepoImpl *r = (RepoImpl *)(ptr);
   if ( r )
     return r->progress_handler(ptr);
-
   return 1;
 }
 

diff --git a/zypp/repo/yum/Downloader.cc b/zypp/repo/yum/Downloader.cc
index 0bee6a3..d338a59 100644 (file)
--- a/zypp/repo/yum/Downloader.cc
+++ b/zypp/repo/yum/Downloader.cc
@@ -97,6 +97,7 @@ void Downloader::download( MediaSetAccess &media,
   //downloadMediaInfo( dest_dir, _media );
   
   _dest_dir = dest_dir;
+  
   if ( _media_ptr->doesFileExist(keypath) )
     this->enqueue( OnMediaLocation(keypath,1) );