aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2002-09-04 13:48:59 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2002-09-04 13:48:59 +0000
commit53dcbb5e6a31910f626605f36e68e8b383ad91da (patch)
tree16c0e7d78f4fdb70ebf1aad179a7ef39942c5698
parent6ea43acd0e8f17de53d77a1b17147894a659e4d7 (diff)
downloadrpmdrake-53dcbb5e6a31910f626605f36e68e8b383ad91da.tar
rpmdrake-53dcbb5e6a31910f626605f36e68e8b383ad91da.tar.gz
rpmdrake-53dcbb5e6a31910f626605f36e68e8b383ad91da.tar.bz2
rpmdrake-53dcbb5e6a31910f626605f36e68e8b383ad91da.tar.xz
rpmdrake-53dcbb5e6a31910f626605f36e68e8b383ad91da.zip
add option "--no-verify-rpm" to not verify packages signatures
-rwxr-xr-xgrpmi/grpmi.pl4
-rwxr-xr-xrpmdrake5
2 files changed, 6 insertions, 3 deletions
diff --git a/grpmi/grpmi.pl b/grpmi/grpmi.pl
index 920602b2..06af2ac1 100755
--- a/grpmi/grpmi.pl
+++ b/grpmi/grpmi.pl
@@ -28,7 +28,7 @@ use lib qw(/usr/lib/libDrakX);
use my_gtk qw(:helpers :wrappers);
$::isStandalone = 1;
-@ARGV or die "usage: ", basename($0), " <[-noupgrade] PACKAGE>...\n";
+@ARGV or die "usage: ", basename($0), " [--no-verify-rpm] <[-noupgrade] PACKAGE>...\n";
sub translate {
my ($s) = @_;
@@ -106,7 +106,7 @@ Do you want to continue (skipping this package)?", $url, $res), 1) or goto clean
}
}
- if ($ARGV[$i] !~ /^-/) {
+ if ($ARGV[$i] !~ /^-/ && !member('--no-verify-rpm', @ARGV)) {
if (-f $ARGV[$i]) {
$label->set(_("Verifying signature of `%s'...", basename($ARGV[$i]))); $mainw->flush;
my $res = grpmi_rpm::verify_sig("$ARGV[$i]");
diff --git a/rpmdrake b/rpmdrake
index c6ea252d..9f226a51 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -25,6 +25,7 @@ BEGIN { #- we want to run this code before the Gtk->init of the use-my_gtk
"@ARGV" =~ /-h/ and do {
printf STDERR "Usage: %s [OPTION]...
--noconfirmation don't ask first confirmation question in MandrakeUpdate mode
+ --no-verify-rpm don't verify packages signatures
", $basename->($0);
exit 0;
};
@@ -868,7 +869,9 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
my_gtk::flush();
}
} else {
- exec('grpmi', (map { ("-noupgrade", $_) } @rpms_install), @rpms_upgrade)
+ exec('grpmi', if_($options{'no-verify-rpm'}, '--no-verify-rpm'),
+ (map { ("-noupgrade", $_) } @rpms_install),
+ @rpms_upgrade)
or fatal_msg(_("Program missing"),
_("A required program is missing (grpmi). Check your installation.")), myexit(-1);
}