Attachment 192 Details for Bug 248 – backport fix from rpm5's URPM

[patch] backport fix from rpm5's URPM

248.diff (text/plain), 956 bytes, created by Thierry Vignaud on 2011-04-04 11:49:39 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2011-04-04 11:49:39 CEST

Size: 956 bytes

patch

obsolete

diff -up ./URPM.xs.tv ./URPM.xs
--- ./URPM.xs.tv	2011-04-04 11:45:32.829613845 +0200
+++ ./URPM.xs	2011-04-04 11:47:03.739638907 +0200
@@ -1234,25 +1234,8 @@ update_header(char *filename, URPM__Pack
 	ts = rpmtsCreate();
 	rpmtsSetVSFlags(ts, _RPMVSF_NOSIGNATURES | vsflags);
 	if (fd != NULL && rpmReadPackageFile(ts, fd, filename, &header) == 0 && header) {
-	  char *basename;
-#ifndef RPM_ORG
-	  struct stat sb;
-#else
-	  int32_t size;
-#endif
-
-	  basename = strrchr(filename, '/');
-#ifndef RPM_ORG
-	  Fstat(fd, &sb);
-#else
-	  size = fdSize(fd);
-#endif
 	  Fclose(fd);
 
-	  /* this is only kept for compatibility with older distros
-	     (where ->filename on "unpacked" URPM::Package rely on FILENAME_TAG) */
-	  headerPutString(header, FILENAME_TAG, basename != NULL ? basename + 1 : filename);
-
 	  if (pkg->h && !(pkg->flag & FLAG_NO_HEADER_FREE)) pkg->h = headerFree(pkg->h);
 	  pkg->h = header;
 	  pkg->flag &= ~FLAG_NO_HEADER_FREE;

Actions: View | Diff

Attachments on bug 248: 96 | 99 | 131 | 192 | 239