aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-08-30 10:13:37 +0000
committerThierry Vignaud <tv@mandriva.org>2007-08-30 10:13:37 +0000
commit0273db33c460ca38cc481071d7a58771bc668781 (patch)
tree3b14fc1b991438d75b12db96c9fbf0bfbd4d0a11
parenta4007b8b42c86b3eb911aa7ae37957b9f4a1509c (diff)
downloadrpmdrake-0273db33c460ca38cc481071d7a58771bc668781.tar
rpmdrake-0273db33c460ca38cc481071d7a58771bc668781.tar.gz
rpmdrake-0273db33c460ca38cc481071d7a58771bc668781.tar.bz2
rpmdrake-0273db33c460ca38cc481071d7a58771bc668781.tar.xz
rpmdrake-0273db33c460ca38cc481071d7a58771bc668781.zip
(open_urpmi_db) do not disable no-verify-rpm option if set in
urpmi.cfg but not passed to rpmdrake through command line
-rwxr-xr-xRpmdrake/pkg.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index b750fffa..9409c172 100755
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -238,7 +238,7 @@ sub open_urpmi_db() {
my $urpm = urpm->new;
$urpm->{options}{'split-level'} ||= 20;
$urpm->{options}{'split-length'} ||= 1;
- $urpm->{options}{'no-verify-rpm'} = $::rpmdrake_options{'no-verify-rpm'};
+ $urpm->{options}{'no-verify-rpm'} = $::rpmdrake_options{'no-verify-rpm'} if defined $::rpmdrake_options{'no-verify-rpm'};
$urpm->{options}{auto} = $::rpmdrake_options{'auto'} if defined $::rpmdrake_options{'auto'};
urpm::set_files($urpm, $::rpmdrake_options{'urpmi-root'}->[0]) if $::rpmdrake_options{'urpmi-root'}->[0];
urpm::args::set_root($urpm, $::rpmdrake_options{'rpm-root'}->[0]) if $::rpmdrake_options{'rpm-root'}->[0];