Hello community, here is the log from the commit of package libzypp checked in at Wed May 3 18:11:30 CEST 2006. -------- --- libzypp/libzypp.changes 2006-05-03 15:38:22.000000000 +0200 +++ STABLE/libzypp/libzypp.changes 2006-05-03 17:51:43.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 3 17:40:45 CEST 2006 - dmacvicar@suse.de + +- Fix yum key verification, because a double variable declaration + +------------------------------------------------------------------- New: ---- YUM.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.Wsp7X4/_old 2006-05-03 18:11:22.000000000 +0200 +++ /var/tmp/diff_new_pack.Wsp7X4/_new 2006-05-03 18:11:22.000000000 +0200 @@ -18,8 +18,9 @@ Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management Version: 0.0.8 -Release: 149 +Release: 152 Source: zypp-0.0.0.tar.bz2 +Patch: YUM.diff Prefix: /usr Provides: yast2-packagemanager Obsoletes: yast2-packagemanager @@ -63,6 +64,7 @@ %prep %setup -q -n zypp-0.0.0 +%patch %build mv configure.ac x @@ -104,6 +106,8 @@ %changelog -n libzypp * Wed May 03 2006 - dmacvicar@suse.de +- Fix yum key verification, because a double variable declaration +* Wed May 03 2006 - dmacvicar@suse.de - use --no-default-keyring to avoid creating a default gpg dir in / (#171055) - rev 3335 ++++++ YUM.diff ++++++ Wed May 3 17:40:45 CEST 2006 - dmacvicar@suse.de - Fix yum key verification, because a double variable declaration Index: zypp/source/yum/YUMSourceImpl.cc =================================================================== --- zypp/source/yum/YUMSourceImpl.cc (revision 3337) +++ zypp/source/yum/YUMSourceImpl.cc (revision 3339) @@ -95,8 +95,6 @@ WAR << "Verifier not found" << endl; } - Pathname _repomd_file; - if ( cache ) { DBG << "Cached metadata found in [" << _cache_dir << "]." << endl; @@ -133,6 +131,8 @@ if ( ! PathInfo(_repomd_file).isExist() ) ZYPP_THROW(Exception("repodata/repomd.xml not found")); + else + MIL << "repomd file is [" << _repomd_file << "]" << std::endl; MIL << "Trying to get the key" << endl; if ( ! _repomd_key.empty() ) @@ -160,7 +160,7 @@ { bool cache = from_cache; - MIL << "Checking repomd.xml integrity" << endl; + MIL << "Checking [" << _repomd_file << "] integrity" << endl; 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"))); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de