folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make rpmfiDecideFate() honor rpmfi digest algorithms 

- this gets into trouble if digest algorithm differs between packages,
  can't be helped (same is true of rpmfiCompare() too)
This commit is contained in:
Panu Matilainen 2008-05-29 15:26:12 +03:00
parent 5046e63f27
commit b851f93fc6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/rpmfi.c
View File

@ -535,17 +535,22 @@ rpmFileAction rpmfiDecideFate(const rpmfi ofi, rpmfi nfi, int skipMissing)
*/
memset(buffer, 0, sizeof(buffer));
if (dbWhat == REG) {
pgpHashAlgo oalgo, nalgo;
size_t odiglen, ndiglen;
const unsigned char * odigest, * ndigest;
odigest = rpmfiMD5(ofi);
odigest = rpmfiDigest(ofi, &oalgo, &odiglen);
if (diskWhat == REG) {
if (rpmDoDigest(PGPHASHALGO_MD5, fn, 0,
if (rpmDoDigest(oalgo, fn, 0,
(unsigned char *)buffer, NULL))
return FA_CREATE; /* assume file has been removed */
if (odigest && !memcmp(odigest, buffer, 16))
if (odigest && !memcmp(odigest, buffer, odiglen))
return FA_CREATE; /* unmodified config file, replace. */
}
ndigest = rpmfiMD5(nfi);
if (odigest && ndigest && !memcmp(odigest, ndigest, 16))
ndigest = rpmfiDigest(nfi, &nalgo, &ndiglen);
/* XXX can't compare different hash types, what should we do here? */
if (oalgo != nalgo || odiglen != ndiglen)
return FA_CREATE;
if (odigest && ndigest && !memcmp(odigest, ndigest, odiglen))
return FA_SKIP; /* identical file, don't bother. */
} else /* dbWhat == LINK */ {
const char * oFLink, * nFLink;