summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorArnaud Patard <rtp@mageia.org>2012-04-30 07:49:17 +0000
committerArnaud Patard <rtp@mageia.org>2012-04-30 07:49:17 +0000
commit83b8f305f8fe1d4ed0c15c50b0d7ead8aab0e218 (patch)
treefcb01877e54797f62a50acbc93e59e9321e5cacf /perl-install
parent5f07c8f6583da80949ae3ec8c49bb4ec282d17eb (diff)
downloaddrakx-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')
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/install/http.pm1
-rw-r--r--perl-install/install/pkgs.pm1
3 files changed, 6 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 62d8969be..0c3dcf0f6 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- pkgs.pm, http.pm: Allow to set urpm curl options in order to be able
+ to make curl quiet when running an autoinstall in text mode. This can
+ be set throught the new option "curl_options" in the auto_inst file.
+ Also, use '-s' by default when downloading VERSION and auto_inst file.
- harddrake service:
o do not disable cpufreq on non-laptops
o remove double apmd check
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;
}