Attachment 147986 Details for Bug 194246 – Improved patch

[patch] Improved patch

rpm-4.4.2-less-rpmnews.patch (text/plain), 1.44 KB, created by Tomas Mraz on 2007-02-13 14:41:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Mraz

Created: 2007-02-13 14:41:56 UTC

Size: 1.44 KB

patch

obsolete

>--- rpm-4.4.2/lib/rpmfi.c.less-rpmnews	2007-02-13 14:52:25.000000000 +0100
>+++ rpm-4.4.2/lib/rpmfi.c	2007-02-13 15:30:50.000000000 +0100
>@@ -577,7 +577,7 @@
>     if (newWhat == XDIR)
> 	return FA_CREATE;
> 
>-    if (diskWhat != newWhat)
>+    if (diskWhat != newWhat && dbWhat != REG && dbWhat != LINK)
> 	return save;
>     else if (newWhat != dbWhat && diskWhat != dbWhat)
> 	return save;
>@@ -593,13 +593,15 @@
>     memset(buffer, 0, sizeof(buffer));
>     if (dbWhat == REG) {
> 	const unsigned char * omd5, * nmd5;
>+	omd5 = rpmfiMD5(ofi);
>+	if (diskWhat == REG) {
> 	/* XXX avoid md5 on sparse /var/log/lastlog file. */
> 	if (strcmp(fn, "/var/log/lastlog"))
> 	if (domd5(fn, buffer, 0, NULL))
> 	    return FA_CREATE;	/* assume file has been removed */
>-	omd5 = rpmfiMD5(ofi);
> 	if (omd5 && !memcmp(omd5, buffer, 16))
> 	    return FA_CREATE;	/* unmodified config file, replace. */
>+	}
> 	nmd5 = rpmfiMD5(nfi);
> /*@-nullpass@*/
> 	if (omd5 && nmd5 && !memcmp(omd5, nmd5, 16))
>@@ -607,11 +609,13 @@
> /*@=nullpass@*/
>     } else /* dbWhat == LINK */ {
> 	const char * oFLink, * nFLink;
>+	oFLink = rpmfiFLink(ofi);
>+	if (diskWhat == LINK) {
> 	if (readlink(fn, buffer, sizeof(buffer) - 1) == -1)
> 	    return FA_CREATE;	/* assume file has been removed */
>-	oFLink = rpmfiFLink(ofi);
> 	if (oFLink && !strcmp(oFLink, buffer))
> 	    return FA_CREATE;	/* unmodified config file, replace. */
>+	}
> 	nFLink = rpmfiFLink(nfi);
> /*@-nullpass@*/
> 	if (oFLink && nFLink && !strcmp(oFLink, nFLink))

Actions: View | Diff

Attachments on bug 194246: 130962 | 147986