aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-03-03 10:22:12 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-03-03 10:22:12 +0000
commit2983985c78bbc6b595c2bff3d843e5ef33dc613d (patch)
tree04ff38e2421baf3a7b0800101d1cddc93ccdaf87
parent6c0d55f82d77e5e80ec5591f98622e5c9b7217b1 (diff)
downloadperl-URPM-2983985c78bbc6b595c2bff3d843e5ef33dc613d.tar
perl-URPM-2983985c78bbc6b595c2bff3d843e5ef33dc613d.tar.gz
perl-URPM-2983985c78bbc6b595c2bff3d843e5ef33dc613d.tar.bz2
perl-URPM-2983985c78bbc6b595c2bff3d843e5ef33dc613d.tar.xz
perl-URPM-2983985c78bbc6b595c2bff3d843e5ef33dc613d.zip
Remove support for the (broken) db option to verify_rpm
-rw-r--r--URPM.pm1
-rw-r--r--URPM.xs31
2 files changed, 7 insertions, 25 deletions
diff --git a/URPM.pm b/URPM.pm
index 2d73853..79105bb 100644
--- a/URPM.pm
+++ b/URPM.pm
@@ -330,7 +330,6 @@ Then, $callback is called for each matching package in the depslist.
Verifies an RPM file.
Recognized options are:
- db => $urpm_db (optional, will use this rpm DB)
nopgp => 0 / 1
nogpg => 0 / 1
nomd5 => 0 / 1
diff --git a/URPM.xs b/URPM.xs
index 97a71a8..b486e8a 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -3342,8 +3342,6 @@ Urpm_verify_rpm(filename, ...)
char *filename
PREINIT:
rpmVSFlags vsflags = RPMVSF_DEFAULT;
- rpmVSFlags oldvsflags = RPMVSF_DEFAULT;
- URPM__DB db = NULL;
Header ret = NULL;
rpmRC rc = 0;
FD_t fd;
@@ -3356,13 +3354,7 @@ Urpm_verify_rpm(filename, ...)
STRLEN len;
char *s = SvPV(ST(i), len);
- if (len == 2 && !memcmp(s, "db", 2)) {
- if (sv_derived_from(ST(i+1), "URPM::DB")) {
- IV tmp = SvIV((SV*)SvRV(ST(i+1)));
- db = INT2PTR(URPM__DB, tmp);
- } else
- croak("db is not of type URPM::DB");
- } else if (len == 5) {
+ if (len == 5) {
if (!memcmp(s, "nopgp", 5) || !memcmp(s, "nogpg", 5)) {
if (SvIV(ST(i+1))) vsflags |= (RPMVSF_NOSHA1 | RPMVSF_NOSHA1HEADER);
}
@@ -3388,17 +3380,11 @@ Urpm_verify_rpm(filename, ...)
if (fdFileno(fd) < 0) {
RETVAL = "Couldn't open file";
} else {
- if (db) {
- ts = db->ts;
- } else {
- /* compabilty mode to use rpmdb installed on / */
- ts = rpmtsCreate();
- read_config_files(0);
- rpmtsSetRootDir(ts, "/");
- rpmtsOpenDB(ts, O_RDONLY);
- }
- /* setting verify flags, keeping trace of current flags */
- oldvsflags = rpmtsSetVSFlags(ts, vsflags);
+ ts = rpmtsCreate();
+ read_config_files(0);
+ rpmtsSetRootDir(ts, "/");
+ rpmtsOpenDB(ts, O_RDONLY);
+ rpmtsSetVSFlags(ts, vsflags);
rc = rpmReadPackageFile(ts, fd, filename, &ret);
fdClose(fd);
@@ -3436,11 +3422,8 @@ Urpm_verify_rpm(filename, ...)
}
}
- if (!db && ts)
+ if (ts)
ts = rpmtsFree(ts);
- else
- /* Restoring verification flag to the ts */
- (void) rpmtsSetVSFlags(ts, oldvsflags);
_free(fmtsig);
if (!RETVAL) RETVAL = "";