- 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.

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;
 }