summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-10-20 14:48:03 +0000
committerThierry Vignaud <tv@mandriva.org>2008-10-20 14:48:03 +0000
commit80b711ae4a24d20fd22178a810b6e4b89c58ecf8 (patch)
tree23d28fad243f9996636625c7de9dadb349f6daad
parent785f4497cda8a0462510eb1267cb70fa6d5d464c (diff)
downloadmgaonline-80b711ae4a24d20fd22178a810b6e4b89c58ecf8.tar
mgaonline-80b711ae4a24d20fd22178a810b6e4b89c58ecf8.tar.gz
mgaonline-80b711ae4a24d20fd22178a810b6e4b89c58ecf8.tar.bz2
mgaonline-80b711ae4a24d20fd22178a810b6e4b89c58ecf8.tar.xz
mgaonline-80b711ae4a24d20fd22178a810b6e4b89c58ecf8.zip
(upgrade) disable custom downloader settings in order to default to aria2
-rw-r--r--NEWS3
-rwxr-xr-xmdkapplet-upgrade-helper7
2 files changed, 10 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 44af1032..e7702269 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- mdkapplet-upgrade-helper
+ o disable custom downloader settings in order to default to aria2
+
Version 2.63 - 16 October 2008
- mdkapplet
diff --git a/mdkapplet-upgrade-helper b/mdkapplet-upgrade-helper
index 03f51054..a4004ba1 100755
--- a/mdkapplet-upgrade-helper
+++ b/mdkapplet-upgrade-helper
@@ -163,6 +163,13 @@ packages as well?)."))
log::explanations("removing all existing urpmi media for upgrade");
run_program::run('urpmi.removemedia', if_($root, '--urpmi-root', $root), '-a');
+ $urpm = Rpmdrake::open_db::fast_open_urpmi_db();
+ if ($urpm->{global_config}{downloader}) {
+ log::explanations("disabling custom downloader in order to use aria2");
+ delete $urpm->{global_config}{downloader};
+ urpm::media::write_config($urpm);
+ }
+
log::explanations("adding urpmi media for new distribution");
$ENV{URPMI_ADDMEDIA_REASON} = join(',', 'reason=upgrade', 'upgrade_by=mdkapplet', "upgrade_from=$product_id->{version}");