summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2022-01-16 23:14:53 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2022-01-17 01:02:29 +0100
commita320a78768074bc35e59b7ce627ba88d16cfd6e8 (patch)
tree96be886ce3767a1ca92b8e7cf9f7288593979596 /perl-install
parentdf5dce945bb3bf66f9f459c279701580d2f83f85 (diff)
downloaddrakx-a320a78768074bc35e59b7ce627ba88d16cfd6e8.tar
drakx-a320a78768074bc35e59b7ce627ba88d16cfd6e8.tar.gz
drakx-a320a78768074bc35e59b7ce627ba88d16cfd6e8.tar.bz2
drakx-a320a78768074bc35e59b7ce627ba88d16cfd6e8.tar.xz
drakx-a320a78768074bc35e59b7ce627ba88d16cfd6e8.zip
Enable to alter default downloader (mga#28539)
Default is still curl. Choice is limited to what is actually included in stage2 (for now, only aria2c, curl or wget) eg: " downloader=wget"
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/install2.pm1
-rw-r--r--perl-install/install/pkgs.pm1
-rw-r--r--perl-install/install/share/list.xml2
4 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b67010eeb..1b6978ae6 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- Enable to alter default downloader (mga#28539)
+ eg: " downloader=wget"
+
Version 18.47 - 30 October 2021
- Adapt to xserver-21.1
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index de48a6dbb..7f6cbd6fe 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -562,6 +562,7 @@ sub parse_args {
'deploops',
'justdb',
'tune-rpm' => sub { $o->{'tune-rpm'} = 'all' },
+ 'downloader=s' => sub { $o->{options}{downloader} = $_[1] },
# GUI options:
'vga16=s',
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 2fcd0eccc..0dbd38751 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -420,6 +420,7 @@ sub empty_packages {
urpm::set_tune_rpm($packages, $::o->{'tune-rpm'}) if $::o->{'tune-rpm'};
$::force = 1;
$packages->{options}{ignoresize} = 1;
+ $packages->{options}{downloader} = $::o->{options}{downloader};
# prevent priority upgrade (redundant for now as $urpm->{root} implies disabling it:
$packages->{options}{'priority-upgrade'} = undef;
# log $trans->add() faillure; FIXME: should we override *urpm::msg::sys_log?
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index 7e093783b..949ff2d09 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -2,7 +2,7 @@
<from expand="binary">
ash dash.static echo
- aria2c cp curl md5sum <!-- needed by urpmi -->
+ aria2c cp curl md5sum wget <!-- needed by urpmi -->
cpio gzip bzip2 xz
grub2-editenv
insmod modinfo rmmod modprobe lsmod