summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2011-05-28 18:55:39 +0000
committerThomas Backlund <tmb@mageia.org>2011-05-28 18:55:39 +0000
commitb8acd90b5f4d0735f22c101f91c057ba07e12b90 (patch)
treed4b67cb0156a74bdf3edb98e9d113f0ccee7df9b
parent196e84d0681f518930ac88faaf5adb2d2b5b7182 (diff)
downloadmgaonline-b8acd90b5f4d0735f22c101f91c057ba07e12b90.tar
mgaonline-b8acd90b5f4d0735f22c101f91c057ba07e12b90.tar.gz
mgaonline-b8acd90b5f4d0735f22c101f91c057ba07e12b90.tar.bz2
mgaonline-b8acd90b5f4d0735f22c101f91c057ba07e12b90.tar.xz
mgaonline-b8acd90b5f4d0735f22c101f91c057ba07e12b90.zip
disable suggesting powerpack upgrade (mga #1153)
-rw-r--r--NEWS4
-rwxr-xr-xmgaapplet-upgrade-helper8
2 files changed, 9 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 227cda3c..43267036 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Version 2.77.28 - 28 May 2010, Thomas Backlund
+
+- disable suggesting powerpack upgrade (mga #1153)
+
Version 2.77.27 - 27 May 2010, Thierry Vignaud
- disable features not supported on Mageia but that do exist on mdv:
diff --git a/mgaapplet-upgrade-helper b/mgaapplet-upgrade-helper
index a045aa09..13fb40ec 100755
--- a/mgaapplet-upgrade-helper
+++ b/mgaapplet-upgrade-helper
@@ -273,10 +273,12 @@ packages as well?)."))
touch(get_stale_upgrade_filename());
- log::explanations(
- "checking if restricted (powerpack) media is to be addded");
+ # disabled for mageia, should be cleaned
+ #log::explanations(
+ # "checking if restricted (powerpack) media is to be addded");
# add_pwp_auth != undef, means user asked for pwp with good credentials
- my $add_pwp_auth = try_to_add_powerpack_media();
+ #my $add_pwp_auth = try_to_add_powerpack_media();
+ my $add_pwp_auth;
log::explanations("removing all existing urpmi media for upgrade");
run_program::run('urpmi.removemedia', if_($root, '--urpmi-root', $root), '-a');