diff options
| -rwxr-xr-x | grpmi/grpmi.pl | 4 | ||||
| -rwxr-xr-x | rpmdrake | 5 |
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]"); @@ -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); } |