Attachment 316863 Details for Bug 462391 – Patch against RPM 4.0.4

[patch] Patch against RPM 4.0.4

rpm-nodirtokens.patch (text/plain), 1010 bytes, created by Peter Åstrand on 2008-09-16 16:36:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Åstrand

Created: 2008-09-16 16:36:15 UTC

Size: 1010 bytes

patch

obsolete

>--- rpm-4.0.4/build/files.c.org	Tue Sep 16 16:01:03 2008
>+++ rpm-4.0.4/build/files.c	Tue Sep 16 16:05:48 2008
>@@ -1305,15 +1305,9 @@
> 
>     if (_addDotSlash)
> 	(void) rpmlibNeedsFeature(h, "PayloadFilesHavePrefix", "4.0-1");
>-
>-    /* Choose how filenames are represented. */
>-    if (_noDirTokens)
>-	expandFilelist(h);
>-    else {
>-	compressFilelist(h);
>-	/* Binary packages with dirNames cannot be installed by legacy rpm. */
>-	(void) rpmlibNeedsFeature(h, "CompressedFileNames", "3.0.4-1");
>-    }
>+    
>+    /* rpmfi only groks compressed filelists */
>+    compressFilelist(h);
> 
>   { TFI_t fi = xcalloc(1, sizeof(*fi));
>     char * a, * d;
>@@ -1425,6 +1419,15 @@
> 	fi = _free(fi);
>     /*@=branchstate@*/
>   }
>+
>+  /* Convert back to expanded filelist if legacy format requested */
>+  if (_noDirTokens)
>+      expandFilelist(h);
>+  else {
>+      /* Binary packages with dirNames cannot be installed by legacy rpm. */
>+      (void) rpmlibNeedsFeature(h, "CompressedFileNames", "3.0.4-1");
>+  }
>+
> }
> 
> /**

Actions: View | Diff

Attachments on bug 462391: 316863