Author: mlandres Date: Mon Oct 13 13:29:36 2008 New Revision: 11313 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11313&view=rev Log: - Fix reading delta rpm checksum from solv file. Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/repo/PackageDelta.cc Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=11313&r1=11312&r2=11313&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Oct 13 13:29:36 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 13 13:28:48 CEST 2008 - ma@suse.de + +- Fix reading delta rpm checksum from solv file. +- revision 11313 + +------------------------------------------------------------------- Mon Oct 13 12:12:39 CEST 2008 - ma@suse.de - Fix package-manager script to properly quote arguments. (bnc #30903) Modified: trunk/libzypp/zypp/repo/PackageDelta.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/PackageDelta.cc?rev=11313&r1=11312&r2=11313&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/PackageDelta.cc (original) +++ trunk/libzypp/zypp/repo/PackageDelta.cc Mon Oct 13 13:29:36 2008 @@ -96,8 +96,18 @@ } case DELTA_CHECKSUM: { - loc.setChecksum(CheckSum::sha1(di.kv.str)); - break; + const char * s = ::repodata_chk2str( di.data, di.key->type, (const unsigned char*)di.kv.str ); + if ( s ) + { + CheckSum val; + switch ( di.key->type ) + { + case REPOKEY_TYPE_MD5: val = CheckSum::md5( s ); break; + case REPOKEY_TYPE_SHA1: val = CheckSum::sha1( s ); break; + case REPOKEY_TYPE_SHA256: val = CheckSum::sha256( s ); break; + } + loc.setChecksum( val ); + } } case DELTA_BASE_EVR: { -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org