Show full url of index files in sources for signature validation
authorDuncan Mac-Vicar P <dmacvicar@suse.de>
Thu, 27 Apr 2006 18:27:31 +0000 (18:27 +0000)
committerDuncan Mac-Vicar P <dmacvicar@suse.de>
Thu, 27 Apr 2006 18:27:31 +0000 (18:27 +0000)
(mentioned in #170139 comment #3)

zypp/source/susetags/SuseTagsImpl.cc
zypp/source/yum/YUMSourceImpl.cc

index 6bcaa67..329eb76 100644 (file)
@@ -418,7 +418,7 @@ namespace zypp
         
         MIL << "SuseTags source: checking 'content' file vailidity using digital signature.." << endl;
         // verify the content file
-        bool valid = z->keyRing()->verifyFileSignatureWorkflow( _content_file, "content", _content_file_sig);
+        bool valid = z->keyRing()->verifyFileSignatureWorkflow( _content_file, (path() + "content").asString() + " (" + url().asString() + ")", _content_file_sig);
           
         // the source is not valid and the user did not want to continue
         if (!valid)
index 7f309d9..0737c7b 100644 (file)
@@ -155,10 +155,9 @@ namespace zypp
             
         MIL << "Checking repomd.xml integrity" << endl;
        
-        if (! getZYpp()->keyRing()->verifyFileSignatureWorkflow(repomd_file, (_path + "/repodata/repomd.xml").asString(), _repomd_signature))
+        if (! getZYpp()->keyRing()->verifyFileSignatureWorkflow(repomd_file, (_path + "/repodata/repomd.xml").asString()+ " (" + url().asString() + ")", _repomd_signature))
           ZYPP_THROW(Exception(N_("Signed repomd.xml file fails signature check")));
         
-
        DBG << "Reading file " << repomd_file << endl;
        ifstream repo_st(repomd_file.asString().c_str());
        YUMRepomdParser repomd(repo_st, "");