aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-08-30 10:29:13 +0000
committerThierry Vignaud <tv@mandriva.org>2007-08-30 10:29:13 +0000
commit99f1bc5737b9121ccf7d98e23ed6b231740045fe (patch)
tree661e3856cbcbd2a13b6d75e00a5a1a7789308b07
parent0273db33c460ca38cc481071d7a58771bc668781 (diff)
downloadrpmdrake-99f1bc5737b9121ccf7d98e23ed6b231740045fe.tar
rpmdrake-99f1bc5737b9121ccf7d98e23ed6b231740045fe.tar.gz
rpmdrake-99f1bc5737b9121ccf7d98e23ed6b231740045fe.tar.bz2
rpmdrake-99f1bc5737b9121ccf7d98e23ed6b231740045fe.tar.xz
rpmdrake-99f1bc5737b9121ccf7d98e23ed6b231740045fe.zip
(open_urpmi_db) fix --no-verify-rpm option (got broken when
introducing urpm::main_loop)
-rwxr-xr-xRpmdrake/pkg.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 9409c172..267e75e5 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'} if defined $::rpmdrake_options{'no-verify-rpm'};
+ $urpm->{options}{'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];
@@ -252,6 +252,7 @@ sub open_urpmi_db() {
};
my $media = ref $::rpmdrake_options{media} ? join(',', @{$::rpmdrake_options{media}}) : '';
urpm::media::configure($urpm, media => $media);
+ print "VERIF: $::rpmdrake_options{'no-verify-rpm'} == $urpm->{options}{'verify-rpm'}\n";
# urpmi only support one search media, hance we'll only support "Main backport":
my ($searchmedia) = grep { $_->{ignore} && $_->{name} =~ /backport/i } @{$urpm->{media}};
urpm::media::configure($urpm, media => $media, if_($searchmedia, searchmedia => $searchmedia->{name}));