Author: dmacvicar Date: Fri Jul 13 16:22:28 2007 New Revision: 6008 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6008&view=rev Log: -fixes to Resolvables - SUSETAGS downloader now downloads all media.1/ and also checks sgnatures Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.h branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.cc branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.h branches/REFACTORING-10_3/libzypp/zypp/repo/susetags/Downloader.cc Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.h?rev=6008&r1=6007&r2=6008&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.h Fri Jul 13 16:22:28 2007 @@ -42,8 +42,6 @@ virtual Date buildtime() const; virtual Date installtime() const; - virtual unsigned mediaNr() const; - // PATTERN virtual bool isDefault() const; virtual bool userVisible() const; Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.cc?rev=6008&r1=6007&r2=6008&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.cc Fri Jul 13 16:22:28 2007 @@ -96,11 +96,6 @@ return Date(); } -unsigned ProductImpl::mediaNr() const -{ - return 1; -} - ////////////////////////////////////////// // PRODUCT ///////////////////////////////////////// Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.h?rev=6008&r1=6007&r2=6008&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.h Fri Jul 13 16:22:28 2007 @@ -41,9 +41,7 @@ virtual bool installOnly() const; virtual Date buildtime() const; virtual Date installtime() const; - - virtual unsigned mediaNr() const; - + // PRODUCT virtual std::string category() const; virtual Url releaseNotesUrl() const; Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/susetags/Downloader.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/susetags/Downloader.cc?rev=6008&r1=6007&r2=6008&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/susetags/Downloader.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/susetags/Downloader.cc Fri Jul 13 16:22:28 2007 @@ -40,7 +40,30 @@ fetcher.start( dest_dir, media ); fetcher.reset(); - fetcher.enqueue( OnMediaLocation().setFilename( _path + "/content") ); + + SignatureFileChecker sigchecker; + + Pathname sig = _path + "/content.asc"; + if ( media.doesFileExist(sig) ) + { + fetcher.enqueue( OnMediaLocation().setFilename(sig) ); + fetcher.start( dest_dir, media ); + fetcher.reset(); + + sigchecker = SignatureFileChecker( dest_dir + sig ); + } + + Pathname key = _path + "/content.key"; + if ( media.doesFileExist(key) ) + { + fetcher.enqueue( OnMediaLocation().setFilename(key) ); + fetcher.start( dest_dir, media ); + fetcher.reset(); + sigchecker.addPublicKey(dest_dir + key); + } + + + fetcher.enqueue( OnMediaLocation().setFilename( _path + "/content"), sigchecker ); fetcher.start( dest_dir, media ); fetcher.reset(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org