Author: dmacvicar Date: Thu Jul 19 17:43:31 2007 New Revision: 6110 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6110&view=rev Log: Merge from master Modified: trunk/libzypp/zypp/repo/MediaInfoDownloader.cc trunk/libzypp/zypp/repo/cached/RepoImpl.cc trunk/libzypp/zypp/repo/yum/Downloader.cc Modified: trunk/libzypp/zypp/repo/MediaInfoDownloader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/MediaInfoDownloader.cc?rev=6110&r1=6109&r2=6110&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/MediaInfoDownloader.cc (original) +++ trunk/libzypp/zypp/repo/MediaInfoDownloader.cc Thu Jul 19 17:43:31 2007 @@ -27,7 +27,7 @@ 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(); Modified: trunk/libzypp/zypp/repo/cached/RepoImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/cached/RepoImpl.cc?rev=6110&r1=6109&r2=6110&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/cached/RepoImpl.cc (original) +++ trunk/libzypp/zypp/repo/cached/RepoImpl.cc Thu Jul 19 17:43:31 2007 @@ -74,7 +74,6 @@ RepoImpl *r = (RepoImpl *)(ptr); if ( r ) return r->progress_handler(ptr); - return 1; } Modified: trunk/libzypp/zypp/repo/yum/Downloader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/yum/Downloader.cc?rev=6110&r1=6109&r2=6110&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/yum/Downloader.cc (original) +++ trunk/libzypp/zypp/repo/yum/Downloader.cc Thu Jul 19 17:43:31 2007 @@ -97,6 +97,7 @@ //downloadMediaInfo( dest_dir, _media ); _dest_dir = dest_dir; + if ( _media_ptr->doesFileExist(keypath) ) this->enqueue( OnMediaLocation(keypath,1) ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org