summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-11-10 14:38:40 +0000
committerThierry Vignaud <tv@mandriva.org>2009-11-10 14:38:40 +0000
commitc526aebacbfbe403c0303d8de0004e1810f9da34 (patch)
tree4b6b1056e296ef4100975f47b4ad96304e8f2d6f
parent50e8254c92b123298dbb85c79b82b44db0ad746d (diff)
downloadmgaonline-c526aebacbfbe403c0303d8de0004e1810f9da34.tar
mgaonline-c526aebacbfbe403c0303d8de0004e1810f9da34.tar.gz
mgaonline-c526aebacbfbe403c0303d8de0004e1810f9da34.tar.bz2
mgaonline-c526aebacbfbe403c0303d8de0004e1810f9da34.tar.xz
mgaonline-c526aebacbfbe403c0303d8de0004e1810f9da34.zip
(really_prepare_add_restricted) rename second instance as
really_prepare_add_enterprise(), thus fixing adding restricted media (#55320)
-rw-r--r--NEWS1
-rwxr-xr-xmdkapplet4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 51b0d9c1..f5ed718d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
- mdkapplet
o add version to distribution list requests
o fix a crash (#55346)
+ o fix adding restricted media (#55320)
- mdkapplet-upgrade-helper
o make sure utf8.pm is loaded before starting an upgrade (#55090)
diff --git a/mdkapplet b/mdkapplet
index 8970c1a9..1070f52d 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -827,7 +827,7 @@ sub prepare_add_restricted() {
}
-sub really_prepare_add_restricted() {
+sub really_prepare_add_enterprise() {
$mdv_update_pid = run_program::raw({ detach => 1 }, 'mdkapplet-enterprise-update-helper', join('', @$product_id{qw(type product version)}));
}
@@ -849,5 +849,5 @@ sub prepare_add_enterprise_update_media() {
]);
setVar('DO_NOT_ASK_FOR_ENTERPRISE_UPDATE_MEDIA', bool2text($warn_me));
$local_config{DO_NOT_ASK_FOR_ENTERPRISE_UPDATE_MEDIA} = bool2text($warn_me);
- $res ? really_prepare_add_restricted() : 0;
+ $res ? really_prepare_add_enterprise() : 0;
}