- 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

1 files changed, 19 insertions, 1 deletions

diff --git a/urpm.pm b/urpm.pm
index 11a3aec9..d76fffcb 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -44,7 +44,7 @@ sub new {
 	obsoletes  => {},
 
 	media      => undef,
-	options    => default_options(),
+	options    => {},
 
 	fatal      => sub { printf STDERR "%s\n", $_[1]; exit($_[0]) },
 	error      => sub { printf STDERR "%s\n", $_[0] },
@@ -65,9 +65,27 @@ sub new_parse_cmdline {
     my ($class) = @_;
     my $urpm = $class->new;
     urpm::args::parse_cmdline(urpm => $urpm);
+    get_global_options($urpm);
     $urpm;
 }
 
+sub _add2hash { my ($a, $b) = @_; while (my ($k, $v) = each %{$b || {}}) { defined $a->{$k} or $a->{$k} = $v } $a }
+
+sub get_global_options {
+    my ($urpm) = @_;
+
+    my $config = urpm::cfg::load_config($urpm->{config})
+      or $urpm->{fatal}(6, $urpm::cfg::err);
+
+    if (my $global = $config->{global}) {
+	_add2hash($urpm->{options}, $global);
+    }
+    #- remember global options for write_config
+    $urpm->{global_config} = $config->{global};
+
+    _add2hash($urpm->{options}, default_options());
+}
+
 sub prefer_rooted {
     my ($root, $file) = @_;
     -e "$root$file" ? "$root$file" : $file;