diff options
author | Francois Pons <fpons@mandriva.com> | 2003-01-28 09:46:21 +0000 |
---|---|---|
committer | Francois Pons <fpons@mandriva.com> | 2003-01-28 09:46:21 +0000 |
commit | f91572f1c34b6cd6bbd83b1f799891ac655021f0 (patch) | |
tree | fca60c1f12d6bbfb284d2a08d6b9c44d35c123d9 /urpmi | |
parent | 5bb188d99416f16b21a34f706a410eaff4a994b3 (diff) | |
download | urpmi-f91572f1c34b6cd6bbd83b1f799891ac655021f0.tar urpmi-f91572f1c34b6cd6bbd83b1f799891ac655021f0.tar.gz urpmi-f91572f1c34b6cd6bbd83b1f799891ac655021f0.tar.bz2 urpmi-f91572f1c34b6cd6bbd83b1f799891ac655021f0.tar.xz urpmi-f91572f1c34b6cd6bbd83b1f799891ac655021f0.zip |
4.2-15mdk
Diffstat (limited to 'urpmi')
-rwxr-xr-x | urpmi | 20 |
1 files changed, 4 insertions, 16 deletions
@@ -202,11 +202,6 @@ while (defined($_ = shift @ARGV)) { } $src = 0; #- reset switch for next package. } -#- get back activated default values of boolean options. -foreach (qw(post-clean use-provides verify-rpm)) { - exists $urpm->{options}{$_} or $urpm->{options}{$_} = 1; -} - #- use install_src to promote all names as src package. if ($install_src) { @files and $urpm->{fatal}(1, _("What can be done with binary rpm files when using --install-src")); @@ -305,17 +300,10 @@ $urpm->configure(nocheck_access => $env || $uid > 0, bug => $bug, parallel => $parallel, ); -#- handle options directly here according to values in configuration file. -foreach (keys %{$urpm->{options} || {}}) { - my $v = $urpm->{options}{$_}; - /^(no-)?verify-rpm$/ and do { - unless (defined $verify_rpm) { - $verify_rpm = defined $v && $v =~ /^(yes|on)$/i; $1 and $verify_rpm = ! $verify_rpm; - } next }; - $urpm->{error}(_("ignoring option \"%s\" not used", $_ )); +#- get back activated default values of boolean options. +foreach (qw(post-clean use-provides verify-rpm)) { + exists $urpm->{options}{$_} or $urpm->{options}{$_} = 1; } -#- get default, this should be reworked to be more useable internally TODO. -defined $verify_rpm or $verify_rpm = 1; my $state = {}; my %requested = $urpm->register_rpms(@files, @src_files); @@ -527,7 +515,7 @@ my %sources = $urpm->download_source_packages($local_sources, $list, }); my %sources_install = %{$urpm->extract_packages_to_install(\%sources) || {}}; -if ($verify_rpm) { +if ($urpm->{options}{'verify-rpm'}) { my @invalid_sources; foreach (values %sources_install, values %sources) { |