[zypp-commit] r6855 - in /trunk/libzypp: tests/repo/susetags/ tests/repo/susetags/data/stable-x86-subset-gz/ tests/repo/susetags/data/stable-x86-subset/ tests/repo/yum/ tests/zypp/ zypp/

Author: dmacvicar Date: Fri Aug 24 00:38:52 2007 New Revision: 6855 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6855&view=rev Log: - Fixes for the checksum/signature subsystem (#302059) Modified: trunk/libzypp/tests/repo/susetags/CMakeLists.txt trunk/libzypp/tests/repo/susetags/Downloader_test.cc trunk/libzypp/tests/repo/susetags/data/stable-x86-subset-gz/content.asc trunk/libzypp/tests/repo/susetags/data/stable-x86-subset/content.asc trunk/libzypp/tests/repo/yum/YUMDownloader_test.cc trunk/libzypp/tests/zypp/KeyRing.cc trunk/libzypp/zypp/Fetcher.cc trunk/libzypp/zypp/Fetcher.h trunk/libzypp/zypp/FileChecker.cc trunk/libzypp/zypp/KeyRing.cc Modified: trunk/libzypp/tests/repo/susetags/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/CMakeLists.txt?rev=6855&r1=6854&r2=6855&view=diff ============================================================================== --- trunk/libzypp/tests/repo/susetags/CMakeLists.txt (original) +++ trunk/libzypp/tests/repo/susetags/CMakeLists.txt Fri Aug 24 00:38:52 2007 @@ -1,4 +1,7 @@ -ADD_EXECUTABLE( Downloader Downloader_test.cc ) +ADD_EXECUTABLE( + Downloader + Downloader_test.cc +) TARGET_LINK_LIBRARIES( Downloader zypp boost_unit_test_framework ) ADD_TEST(Downloader ${CMAKE_CURRENT_BINARY_DIR}/Downloader ${CMAKE_CURRENT_SOURCE_DIR}/data ) \ No newline at end of file Modified: trunk/libzypp/tests/repo/susetags/Downloader_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/Downloader_test.cc?rev=6855&r1=6854&r2=6855&view=diff ============================================================================== --- trunk/libzypp/tests/repo/susetags/Downloader_test.cc (original) +++ trunk/libzypp/tests/repo/susetags/Downloader_test.cc Fri Aug 24 00:38:52 2007 @@ -13,6 +13,7 @@ #include "zypp/TmpPath.h" #include "zypp/repo/susetags/Downloader.h" +#include "tests/zypp/KeyRingTestReceiver.h" using std::cout; using std::endl; @@ -24,6 +25,9 @@ void susetags_download_test(const string &dir) { + KeyRingTestReceiver keyring_callbacks; + keyring_callbacks.answerTrustKey(true); + Pathname p = dir + "/stable-x86-subset"; Url url("dir:" + p.asString()); MediaSetAccess media(url); @@ -77,6 +81,9 @@ void susetags_gz_download_test(const string &dir) { + KeyRingTestReceiver keyring_callbacks; + keyring_callbacks.answerTrustKey(true); + Pathname p = dir + "/stable-x86-subset-gz"; Url url("dir:" + p.asString()); MediaSetAccess media(url); Modified: trunk/libzypp/tests/repo/susetags/data/stable-x86-subset-gz/content.asc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/data/stable-x86-subset-gz/content.asc?rev=6855&r1=6854&r2=6855&view=diff ============================================================================== --- trunk/libzypp/tests/repo/susetags/data/stable-x86-subset-gz/content.asc (original) +++ trunk/libzypp/tests/repo/susetags/data/stable-x86-subset-gz/content.asc Fri Aug 24 00:38:52 2007 @@ -1,32 +1,7 @@ ------BEGIN PGP MESSAGE----- -Version: GnuPG v1.4.6 (GNU/Linux) +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.9.22 (GNU/Linux) -owGdlsuLI1UUxtsZRAkozMaNm4sLQZxU7vvRjkjSST8wdsZUMs64ae4zHTupCqkK -3T1LF4PuZi+I4MKV6MY/QBcD7gSX4sqtGxFEXHkr6XaSVhkYSKpInXN+de93vlOp -hy9c37p245Nfv/vm56/FnWe+fP7UPGfzrPRZufv9w+ntfq893BmAfOazdJh26kHb -Mp+f1+50+ulB7xAgmJBa+yAdXGami5jVHWeLs3o6aLa6nfpdyZcZayU4oXgNddju -9UGFB92Dw+FdcHueu4UtC7A3Nfs3weHCzzPj56ObYM/Ppzo7r/U73cPeoJMO+11w -XJaz7Ubj9PQ0KRaFT2w+bcz9JMtLXzTGRPLG5eobu82dQa9/rwp7Xfj6MieZz6a1 -Zn9nPzmT/IhTcHEac8nBmFUHWh0iCWS5ntvjVfYq/qQk9oQ4/f8QuXK13dltDruD -VjMKVSGjCu8OD/qd9HF7LjYG3lw2Bsx0WUbttk28VpwXpZ/WYp/uHLRjzWwl8vZl -7aqm6kyt10p73c5gLalKOFo15191t1aFtRjeGzZTYAvgNHAe+Cx+jvZawBcgjEGY -g+MFGJfgAw1OpiCbgMyA2QTMyqNWH9w/Pto5rI6D92rpfq8/6DZbnS646Fht9euf -e15cXtlvGUviDf873Lk76DejUdJLp7j8NJvk2iVV/tIy+XzUcOOinI/NohznWaPa -UHTJLG/kRdGo9W4PonOb3aemZHlWr0hPVey8WYwasf3pTr990AdVfqPw5WIWQ4Wd -19rNQfMyUNvtNvdSsJg5XfooTdWTvU7ViGFae6czaIJ0v4kAMURTAwOUzDnCITMc -Wect5EISww3WKCDHEQAnztcrHesCLd2cRFMlo/trLGwJQx7ByKTCB6wktRGgOZHa -2uC1C9oHJkH0oz3Rozhy7eEVBJSaB+mRVdwro7HXwgpqIUOIWISsIEJKTNYQPttE -MOU4M5IJZjTyznkkEQlxOV4pqrSXLFBHLVpHFJsIGDUgPBYHjpgwlmJBpMCQMYkj -xiHBuZGWriE26hElgjBGJKKaBEksdtZzy52mUFCofSUR5AxcDuay/u3OvVW5hYRR -yJVFUCLFBXVaCsireyNHjYMWCSW8AmA0G9VnC3Piz+vQBUOQlHUa162wMoku7GMm -9kR6BomlhFvmIMTGWYIEY1biWAYpdcphtMEkUHjiGK1TiiFyzG0yBcRMEezjo4/H -c6BSUYyUglCwQLwjCENMvN5kOswccapOuEfYQbrJDNFrlFttpUVUEMsMwyyCCXde -iLgYYxzjCG4whY/bM5DFdQoqtdGbTOuEjg2IdgieORFdJQwTVAkkBSVIYSdxkBBv -MJWVEGqr6xQ6CTnxV/bOSEQpT5APwlAcZWBRDGOocgpRrIQ00Spsg6mRQjhaPK6T -ayiVWjL3m+n+hW8ENsQGITCXgXIfRzB+NWdEwcjnxBqFvIqCTsY2Pi98Uup5ZZ3H -CKq1dN5xEgu4t5JxBTVDOvCqwyHEoYotqgao+nef55PkbDpZq49KxIEX1gsaoHUk -WE1lNXqismJ0mAhWMewAGGdFqScTXT2krkC4dMrErsVeVgJJ7KUkNK4knqkOUX/B -EJYCgKl3Y52gxjgLeVKelbXaR29df3areuW4fBe5ce2Hl7c+fe2P7Qfdvx7RVz9P -XvntpW97b4wfgK3PPvzqxdGDax8//OLR77+8//pPZ7daf/74Nw== -=3cih ------END PGP MESSAGE----- +iD8DBQBGzZ7Vm+zCtd2wN1YRAvrYAJ4or9MtpTiRk57EiGkd3YBvgoIN5QCfX969 +j0d5j3iteCP3nR/N39nrdMo= +=w2Lh +-----END PGP SIGNATURE----- Modified: trunk/libzypp/tests/repo/susetags/data/stable-x86-subset/content.asc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/data/stable-x86-subset/content.asc?rev=6855&r1=6854&r2=6855&view=diff ============================================================================== --- trunk/libzypp/tests/repo/susetags/data/stable-x86-subset/content.asc (original) +++ trunk/libzypp/tests/repo/susetags/data/stable-x86-subset/content.asc Fri Aug 24 00:38:52 2007 @@ -1,32 +1,7 @@ ------BEGIN PGP MESSAGE----- -Version: GnuPG v1.4.6 (GNU/Linux) +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.9.22 (GNU/Linux) -owGdVjuPG1UU3iRCIEsUaaCguYIiEort+35EvLxr70Mx6+CxQ6BZ3eeuWXtsecba -3TR0CLr0FKmJhKBBoqZBlCAigQQVLRI/AAlxZr1LvAEUKZI9V55zvu/e833njOfe -81fWLl/99Pdvvvr1S3X70ufPRfesn+ZlzMvN7+69cavfaw83Bmg6i3k2zDr1ZH05 -nZ/Ubnf62U5vFxHcYLX2TjY4z8wWkNUd5YvjejZorXc79TtanmasQGiD0xWq3Xav -jyp61N3ZHd5Bt+bTsPBlgbYmbvs62l3Eee7ifP862orzic1Pav1Od7c36GTDfhcd -lOXsRrN5dHTUKBZFbPjppDmP43xaxqI5Ylo2z0/f3GxtDHr996pwtEWsn+Y05rNJ -rdXf2G4ca7knOTpbRlJLNBLVhVcXYEL51M79wTJ7GX9SknhCnP9/iD12t93ZbA27 -g/UWCFVRggrvDHf6neyRPWeFoddPjUEzW5ag3Q0H94qTooyTGvh0e6cNmNlS5Bvn -2CWmcqbWW8963c5gJalK2Fua8y/ca0tgDcJbw1aGfIGCRSGimMNnb2sdxQKlEUpz -dLBAoxJ9YNHhBOVjlDs0G6NZubfeR3cP9jZ2q+vg3Vq23esPuq31ThedOVZb/vpn -z7Pby/Y7jTVgw/8Od+4M+i1olOy8U8L0KB9PbWhU+actM53vN8OoKOcjtyhH07xZ -FQRdMps2p0XRrPVuDaBzW92nZsmneb1ieipwiG6x3wT7s41+e6ePqvxmEcvFDEKF -n9farUHrPFDb7La2MrSYBVtGkKbyZKtTGTHMam93Bi2UbbcI8kwl7iynVEiBNedM -MkWIItgzTbkV2htMQkDoMMR6pWNdkdNubkBTrRBpnIxzJJloRHQ+uhSMozQxppNS -JlLMfRDYIWhGf2j3Y7ECNp5xEgwjFCYAJ8wcxkRqIgjzFivHA/ZWK/YI3GgPV/CW -62QFVjZ5D3sr6QQ3AGSGx4pYExalw2QFH/MVvJLCYJxEtR8kJm4knBVLF1LiImks -oiTGqFX86vmTc9LSII2SIKg3VrroBPWWiaSE4TaymBKJ6HwSi9rNzntnDmAmOJbG -E6yJkYoHqBRLTWkkgTuonCijokFof7Zfny3cYTyp45AcI1rXOYnBUOMatvCPOGlk -OgrMPNjpRcCYuuAZUUJ4TQGGOQ8mUHKBk2EVWRC8zjkFy0W4yKkwFYbRCA86CWvi -2nAKomCsRGIxgHmYsmgvcgYqAgumzmQkNGB+kTMFSbj01mtPuGJegGgCiJkMUSk4 -jHNBSIIvcKoI5Tks4JyKa+vsRU4flA3Qf5akKIJylionFDeKaMUZMTRoCo7SC5zG -a4ytt3WOg8aSxcdqFwyoTGQkJuhGCjIIEMM5boIhnBqlHYXGv8BpiSGUYvCIS4u1 -Maec261se0lKFHXMw3BQqROXUWkGXysFMxj4JfPOkGhA0PHIw9MhNko7b+zfXaHg -1uoQg2QAkNFrIQ22gtgkK4dTijCCUDHMTfVfPp+OG8eT8QoelCCJKJgYnrAPLHmY -JJgBoqpWhA5TyRtBYfpHeVHa8dhWj6THSKSGSQfXwMtKIE2j1ozDSWDlNoH+ShCq -YXgmMYxsgzRHeZo2yuOyVvv4zSvPrFUvGOdvHlcv7369dv/mg2voz8/ev/Ti7R+u -vfyFunb8x88frd133z544eFPv3y49v3ll1595bcf//rkrYd/Aw== -=/aaM ------END PGP MESSAGE----- +iD8DBQBGzZ7Im+zCtd2wN1YRAvQ2AJ9S5chSnjnFR0P2IZO7485uodmb1QCeJzuj +Ta+M4yWexFiqyaFmWRjdAuQ= +=lrpc +-----END PGP SIGNATURE----- Modified: trunk/libzypp/tests/repo/yum/YUMDownloader_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/yum/YUMDownloader_test.cc?rev=6855&r1=6854&r2=6855&view=diff ============================================================================== --- trunk/libzypp/tests/repo/yum/YUMDownloader_test.cc (original) +++ trunk/libzypp/tests/repo/yum/YUMDownloader_test.cc Fri Aug 24 00:38:52 2007 @@ -7,12 +7,12 @@ #include #include +#include "zypp/base/Logger.h" #include "zypp/Url.h" #include "zypp/PathInfo.h" #include "zypp/TmpPath.h" #include "zypp/repo/yum/Downloader.h" - using std::cout; using std::endl; using std::string; @@ -21,8 +21,13 @@ using namespace zypp::repo; +#include "tests/zypp/KeyRingTestReceiver.h" + void yum_download_test(const string &dir) { + KeyRingTestReceiver keyring_callbacks; + keyring_callbacks.answerTrustKey(true); + Pathname p = dir + "/10.2-updates-subset"; Url url("dir:" + p.asString()); MediaSetAccess media(url); Modified: trunk/libzypp/tests/zypp/KeyRing.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/KeyRing.cc?rev=6855&r1=6854&r2=6855&view=diff ============================================================================== --- trunk/libzypp/tests/zypp/KeyRing.cc (original) +++ trunk/libzypp/tests/zypp/KeyRing.cc Fri Aug 24 00:38:52 2007 @@ -201,7 +201,9 @@ KeyRing keyring( tmp_dir.path() ); BOOST_CHECK_EQUAL( keyring.readSignatureKeyId( Pathname(dir) + "repomd.xml.asc" ), "BD61D89BD98821BE" ); - BOOST_CHECK_EQUAL( keyring.readSignatureKeyId(Pathname()), "" ); + BOOST_CHECK_THROW( keyring.readSignatureKeyId(Pathname()), Exception ); + TmpFile tmp; + BOOST_CHECK_EQUAL( keyring.readSignatureKeyId(tmp.path()), "" ); } } Modified: trunk/libzypp/zypp/Fetcher.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Fetcher.cc?rev=6855&r1=6854&r2=6855&view=diff ============================================================================== --- trunk/libzypp/zypp/Fetcher.cc (original) +++ trunk/libzypp/zypp/Fetcher.cc Fri Aug 24 00:38:52 2007 @@ -13,6 +13,7 @@ #include <list> #include "zypp/base/Logger.h" +#include "zypp/base/PtrTypes.h" #include "zypp/base/DefaultIntegral.h" #include "zypp/Fetcher.h" #include "zypp/base/UserRequestException.h" @@ -32,13 +33,21 @@ FetcherJob( const OnMediaLocation &loc ) : location(loc) { + //MIL << location << endl; + } + ~FetcherJob() + { + //MIL << location << " | * " << checkers.size() << endl; } OnMediaLocation location; - CompositeFileChecker checkers; + //CompositeFileChecker checkers; + list<FileChecker> checkers; }; + typedef shared_ptr<FetcherJob> FetcherJob_Ptr; + /////////////////////////////////////////////////////////////////// // // CLASS NAME : Fetcher::Impl @@ -70,7 +79,7 @@ Impl * clone() const { return new Impl( *this ); } - std::list<FetcherJob> _resources; + std::list _resources; std::list<Pathname> _caches; }; /////////////////////////////////////////////////////////////////// @@ -78,18 +87,21 @@ void Fetcher::Impl::enqueueDigested( const OnMediaLocation &resource, const FileChecker &checker ) { - CompositeFileChecker composite; - composite.add(ChecksumFileChecker(resource.checksum())); - composite.add(checker); - FetcherJob job(resource); - job.checkers = composite; + FetcherJob_Ptr job; + job.reset(new FetcherJob(resource)); + ChecksumFileChecker digest_check(resource.checksum()); + job->checkers.push_back(digest_check); + if ( checker ) + job->checkers.push_back(checker); _resources.push_back(job); } void Fetcher::Impl::enqueue( const OnMediaLocation &resource, const FileChecker &checker ) { - FetcherJob job(resource); - job.checkers.add(checker); + FetcherJob_Ptr job; + job.reset(new FetcherJob(resource)); + if ( checker ) + job->checkers.push_back(checker); _resources.push_back(job); } @@ -120,25 +132,25 @@ ProgressData progress(_resources.size()); progress.sendTo(progress_receiver); - for ( list<FetcherJob>::const_iterator it_res = _resources.begin(); it_res != _resources.end(); ++it_res ) + for ( list::const_iterator it_res = _resources.begin(); it_res != _resources.end(); ++it_res ) { bool got_from_cache = false; for ( list<Pathname>::const_iterator it_cache = _caches.begin(); it_cache != _caches.end(); ++it_cache ) { // does the current file exists in the current cache? - Pathname cached_file = *it_cache + (*it_res).location.filename(); + Pathname cached_file = *it_cache + (*it_res)->location.filename(); if ( PathInfo( cached_file ).isExist() ) { // check the checksum - if ( is_checksum( cached_file, (*it_res).location.checksum() ) && (! (*it_res).location.checksum().empty() ) ) + if ( is_checksum( cached_file, (*it_res)->location.checksum() ) && (! (*it_res)->location.checksum().empty() ) ) { // cached - MIL << "file " << (*it_res).location.filename() << " found in previous cache. Using cached copy." << endl; + MIL << "file " << (*it_res)->location.filename() << " found in previous cache. Using cached copy." << endl; // checksum is already checked. // we could later implement double failover and try to download if file copy fails. // replicate the complete path in the target directory - Pathname dest_full_path = dest_dir + (*it_res).location.filename(); + 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())); @@ -161,8 +173,8 @@ // try to get the file from the net try { - Pathname tmp_file = media.provideFile((*it_res).location); - Pathname dest_full_path = dest_dir + (*it_res).location.filename(); + Pathname tmp_file = media.provideFile((*it_res)->location); + 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 ( filesystem::copy(tmp_file, dest_full_path ) != 0 ) @@ -174,10 +186,10 @@ } catch (const Exception & excpt_r) { - ZYPP_CAUGHT(excpt_r); - Exception nexcpt("Can't provide " + (*it_res).location.filename().asString() + " : " + excpt_r.msg()); - nexcpt.remember(excpt_r); - ZYPP_THROW(nexcpt); + ZYPP_CAUGHT(excpt_r); + Exception nexcpt("Can't provide " + (*it_res)->location.filename().asString() + " : " + excpt_r.msg()); + nexcpt.remember(excpt_r); + ZYPP_THROW(nexcpt); } } else @@ -188,11 +200,24 @@ } // no matter where did we got the file, try to validate it: - Pathname localfile = dest_dir + (*it_res).location.filename(); + Pathname localfile = dest_dir + (*it_res)->location.filename(); // call the checker function try { - MIL << "Checking " << localfile << endl; - (*it_res).checkers(localfile); + MIL << "Checking job [" << localfile << "] (" << (*it_res)->checkers.size() << " checkers )" << endl; + for ( list<FileChecker>::const_iterator it = (*it_res)->checkers.begin(); + it != (*it_res)->checkers.end(); + ++it ) + { + if (*it) + { + (*it)(localfile); + } + else + { + ERR << "Invalid checker for '" << localfile << "'" << endl; + } + } + } catch ( const FileCheckException &e ) { @@ -204,7 +229,7 @@ } catch (...) { - ZYPP_THROW(Exception("Unknown error while validating " + (*it_res).location.filename().asString())); + ZYPP_THROW(Exception("Unknown error while validating " + (*it_res)->location.filename().asString())); } if ( ! progress.incr() ) @@ -243,7 +268,7 @@ void Fetcher::enqueueDigested( const OnMediaLocation &resource, const FileChecker &checker ) { - _pimpl->enqueue(resource, checker); + _pimpl->enqueueDigested(resource, checker); } void Fetcher::enqueue( const OnMediaLocation &resource, const FileChecker &checker ) Modified: trunk/libzypp/zypp/Fetcher.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Fetcher.h?rev=6855&r1=6854&r2=6855&view=diff ============================================================================== --- trunk/libzypp/zypp/Fetcher.h (original) +++ trunk/libzypp/zypp/Fetcher.h Fri Aug 24 00:38:52 2007 @@ -82,7 +82,7 @@ * */ void enqueue( const OnMediaLocation &resource, - const FileChecker &checker = NullFileChecker() ); + const FileChecker &checker = FileChecker() ); /** * Enqueue a object for transferal, they will not @@ -96,7 +96,7 @@ * \todo FIXME implement checker == operator to avoid this. */ void enqueueDigested( const OnMediaLocation &resource, - const FileChecker &checker = NullFileChecker() ); + const FileChecker &checker = FileChecker() ); /** * adds a directory to the list of directories Modified: trunk/libzypp/zypp/FileChecker.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/FileChecker.cc?rev=6855&r1=6854&r2=6855&view=diff ============================================================================== --- trunk/libzypp/zypp/FileChecker.cc (original) +++ trunk/libzypp/zypp/FileChecker.cc Fri Aug 24 00:38:52 2007 @@ -29,6 +29,7 @@ void ChecksumFileChecker::operator()( const Pathname &file ) const { + MIL << "checking " << file << " file against checksum '" << _checksum << "'" << endl; callback::SendReport<DigestReport> report; CheckSum real_checksum( _checksum.type(), filesystem::checksum( file, _checksum.type() )); @@ -64,16 +65,24 @@ void NullFileChecker::operator()(const Pathname &file ) const { + MIL << "+ null check on " << file << endl; return; } void CompositeFileChecker::operator()(const Pathname &file ) const { - MIL << _checkers.size() << " checkers" << endl; + //MIL << _checkers.size() << " checkers" << endl; for ( list<FileChecker>::const_iterator it = _checkers.begin(); it != _checkers.end(); ++it ) - { - MIL << "checking..." << endl; - (*it)(file); + { + if ( *it ) + { + //MIL << "+ chk" << endl; + (*it)(file); + } + else + { + ERR << "Invalid checker" << endl; + } } } Modified: trunk/libzypp/zypp/KeyRing.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/KeyRing.cc?rev=6855&r1=6854&r2=6855&view=diff ============================================================================== --- trunk/libzypp/zypp/KeyRing.cc (original) +++ trunk/libzypp/zypp/KeyRing.cc Fri Aug 24 00:38:52 2007 @@ -534,7 +534,10 @@ string KeyRing::Impl::readSignatureKeyId(const Pathname &signature ) { - MIL << "Deetermining key id if signature " << signature << endl; + if ( ! PathInfo(signature).isFile() ) + ZYPP_THROW(Exception("Signature file " + signature.asString() + " not found")); + + MIL << "Determining key id if signature " << signature << endl; // HACK create a tmp keyring with no keys TmpDir dir(_base_dir, "fake-keyring"); TmpFile fakeData(_base_dir, "fake-data"); @@ -574,7 +577,17 @@ id = what[1]; //dumpRegexpResults(what); } + else + { + MIL << "'" << line << "'" << endl; + } } + + if ( count == 0 ) + { + MIL << "no output" << endl; + } + MIL << "Determined key id [" << id << "] for signature " << signature << endl; prog.close(); return id; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org