summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-12-12 11:33:39 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-12-12 11:33:39 +0000
commit4bda2339695fac3b3cc2b73cf3a1d23dcdb569a9 (patch)
tree93f358657fc9819981adb01686bc0b46d8a05242 /urpm
parentdf23d1acfe8752f339f9f69d212cfa240f578796 (diff)
downloadurpmi-4bda2339695fac3b3cc2b73cf3a1d23dcdb569a9.tar
urpmi-4bda2339695fac3b3cc2b73cf3a1d23dcdb569a9.tar.gz
urpmi-4bda2339695fac3b3cc2b73cf3a1d23dcdb569a9.tar.bz2
urpmi-4bda2339695fac3b3cc2b73cf3a1d23dcdb569a9.tar.xz
urpmi-4bda2339695fac3b3cc2b73cf3a1d23dcdb569a9.zip
- urpmi:
o fix handling "post-clean: 0" in urpmi.cfg (#36082, regression introduced 2007-11-28) - library: o urpm::media::read_config() doesn't read urpmi.cfg global options anymore, use urpm->get_global_options or urpm->new_parse_cmdline
Diffstat (limited to 'urpm')
-rw-r--r--urpm/media.pm13
1 files changed, 0 insertions, 13 deletions
diff --git a/urpm/media.pm b/urpm/media.pm
index 59ea1cb4..ac9aeb91 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -117,17 +117,7 @@ sub read_config {
my $config = urpm::cfg::load_config($urpm->{config})
or $urpm->{fatal}(6, $urpm::cfg::err);
- #- global options
- if (my $global = $config->{global}) {
- foreach my $opt (keys %$global) {
- if (defined $global->{$opt} && !exists $urpm->{options}{$opt}) {
- $urpm->{options}{$opt} = $global->{$opt};
- }
- }
- }
-
#- per-media options
-
read_config_add_passwords($urpm, $config);
foreach my $m (@{$config->{media}}) {
@@ -151,9 +141,6 @@ sub read_config {
$_->{md5sum} = $md5sum;
}
}
-
- #- remember global options for write_config
- $urpm->{global_config} = $config->{global};
}
#- if invalid, set {ignore}