Author: dmacvicar Date: Thu Mar 13 18:48:36 2008 New Revision: 9139 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9139&view=rev Log: fix retrieving keys (bnc #368099) version 4.4.1 Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/repo/yum/Downloader.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=9139&r1=9138&r2=9139&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Thu Mar 13 18:48:36 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "4") SET(LIBZYPP_COMPATMINOR "4") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "111111111111") Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=9139&r1=9138&r2=9139&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Mar 13 18:48:36 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 13 18:41:26 CET 2008 - dmacvicar@suse.de + +- fix retrieving keys (bnc #368099) +- version 4.4.1 + +------------------------------------------------------------------- Thu Mar 13 18:40:57 CET 2008 - jreidinger@suse.cz - enable frontend to rewrite add_probe settings.(bnc #309612) Modified: trunk/libzypp/zypp/repo/yum/Downloader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/yum/Downloader.cc?rev=9139&r1=9138&r2=9139&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/yum/Downloader.cc (original) +++ trunk/libzypp/zypp/repo/yum/Downloader.cc Thu Mar 13 18:48:36 2008 @@ -105,25 +105,30 @@ _dest_dir = dest_dir; - if ( _media_ptr->doesFileExist(keypath) ) - this->enqueue( OnMediaLocation(keypath,1) ); + SignatureFileChecker sigchecker; if ( _media_ptr->doesFileExist(sigpath) ) + { this->enqueue( OnMediaLocation(sigpath,1) ); + this->start( dest_dir, *_media_ptr); + this->reset(); + sigchecker = SignatureFileChecker(dest_dir + sigpath); + } + + if ( _media_ptr->doesFileExist(keypath) ) + { + this->enqueue( OnMediaLocation(keypath,1) ); + this->start( dest_dir, *_media_ptr); + this->reset(); + sigchecker.addPublicKey(dest_dir + keypath); + } + this->start( dest_dir, *_media_ptr ); if ( ! progress.tick() ) ZYPP_THROW(AbortRequestException()); - SignatureFileChecker sigchecker; - - if ( PathInfo( dest_dir + sigpath ).isExist() ) - sigchecker = SignatureFileChecker(dest_dir + sigpath); - - if ( PathInfo( dest_dir + keypath ).isExist() ) - sigchecker.addPublicKey(dest_dir + keypath ); - this->enqueue( OnMediaLocation(repomdpath,1), sigchecker ); this->start( dest_dir, *_media_ptr); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org