diff options
| author | Arnaud Patard <rtp@mageia.org> | 2012-04-30 07:49:17 +0000 |
|---|---|---|
| committer | Arnaud Patard <rtp@mageia.org> | 2012-04-30 07:49:17 +0000 |
| commit | 83b8f305f8fe1d4ed0c15c50b0d7ead8aab0e218 (patch) | |
| tree | fcb01877e54797f62a50acbc93e59e9321e5cacf /perl-install/install | |
| parent | 5f07c8f6583da80949ae3ec8c49bb4ec282d17eb (diff) | |
| download | drakx-83b8f305f8fe1d4ed0c15c50b0d7ead8aab0e218.tar drakx-83b8f305f8fe1d4ed0c15c50b0d7ead8aab0e218.tar.gz drakx-83b8f305f8fe1d4ed0c15c50b0d7ead8aab0e218.tar.bz2 drakx-83b8f305f8fe1d4ed0c15c50b0d7ead8aab0e218.tar.xz drakx-83b8f305f8fe1d4ed0c15c50b0d7ead8aab0e218.zip | |
- Allow to set urpm curl options in order to be able to make curl quiet. Setting
this option to '-s' is making text autoinstall a lot cleaner and avoids missing
warnings when installing rpms.
Diffstat (limited to 'perl-install/install')
| -rw-r--r-- | perl-install/install/http.pm | 1 | ||||
| -rw-r--r-- | perl-install/install/pkgs.pm | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/install/http.pm b/perl-install/install/http.pm index 2a625dff3..1ddf986a1 100644 --- a/perl-install/install/http.pm +++ b/perl-install/install/http.pm @@ -41,6 +41,7 @@ sub get_file_and_size { if (!$urpm) { require install::pkgs; $urpm = install::pkgs::empty_packages($::o->{keep_unrequested_dependencies}); + $urpm->{options}{'curl-options'} = '-s'; } my $cachedir = $urpm->{cachedir} || '/root'; diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index dcdceb45c..9fd8b8f09 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -383,6 +383,7 @@ sub empty_packages { $packages->{options}{'priority-upgrade'} = undef; # log $trans->add() faillure; FIXME: should we override *urpm::msg::sys_log? $packages->{debug} = $packages->{debug_URPM} = \&log::l; + $packages->{options}{'curl-options'} = $::o->{curl_options} if $::o->{curl_options}; $packages; } |