aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-02-29 23:45:51 +0000
committerThierry Vignaud <tv@mageia.org>2012-02-29 23:45:51 +0000
commitfb163a4509e7137ead77c2729cff4ba79e06c79f (patch)
tree6528a3c6d6f2b56da6c7ba4b01828414d24c662b
parent518f1004e940a59906de665307864731a314b484 (diff)
downloadperl-URPM-fb163a4509e7137ead77c2729cff4ba79e06c79f.tar
perl-URPM-fb163a4509e7137ead77c2729cff4ba79e06c79f.tar.gz
perl-URPM-fb163a4509e7137ead77c2729cff4ba79e06c79f.tar.bz2
perl-URPM-fb163a4509e7137ead77c2729cff4ba79e06c79f.tar.xz
perl-URPM-fb163a4509e7137ead77c2729cff4ba79e06c79f.zip
(update_header) do not add FILENAME_TAG to hdlist anymore (unused since mdv2008)
Conflicts: NEWS
-rw-r--r--NEWS1
-rw-r--r--URPM.xs9
2 files changed, 1 insertions, 9 deletions
diff --git a/NEWS b/NEWS
index b0168eb..2b18778 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- do not add FILENAME_TAG to hdlist anymore (unused since mdv2008)
- fix computing size of added/freed disk space when updating involves removing
some packages (mga#4427)
- fix for a rare crash (mga#4425)
diff --git a/URPM.xs b/URPM.xs
index 3bbba18..87b4df8 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -96,8 +96,6 @@ typedef struct s_Package* URPM__Package;
#define FLAG_RATE_INVALID 0
-#define FILENAME_TAG 1000000
-
#define FILTER_MODE_ALL_FILES 0
#define FILTER_MODE_CONF_FILES 2
@@ -1186,15 +1184,8 @@ update_header(char *filename, URPM__Package pkg, __attribute__((unused)) int kee
ts = rpmtsCreate();
rpmtsSetVSFlags(ts, _RPMVSF_NOSIGNATURES | vsflags);
if (fd != NULL && rpmReadPackageFile(ts, fd, filename, &header) == 0 && header) {
- char *basename;
-
- basename = strrchr(filename, '/');
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;