Attachment 3623 Details for Bug 6061 – patch to enable media if they were previously enabled

[patch] patch to enable media if they were previously enabled

mgaapplet-upgrade-helper.patch (text/plain), 902 bytes, created by Derek Jennings on 2013-03-16 22:49:45 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Derek Jennings

Created: 2013-03-16 22:49:45 CET

Size: 902 bytes

patch

obsolete

--- /usr/sbin/mgaapplet-upgrade-helper	2012-04-22 00:55:46.000000000 +0100
+++ mgaapplet-upgrade-helper	2013-03-16 20:50:29.000000000 +0000
@@ -280,6 +280,12 @@
     #my $add_pwp_auth =  try_to_add_powerpack_media();
     my $add_pwp_auth;
 
+    my $non_free_enabled;
+    my  $tainted_enabled;
+    my $active_media = `urpmq --list-media active`;
+    if ($active_media =~ /Nonfree/) { $non_free_enabled = 1 }
+    if ($active_media =~ /Tainted/) { $tainted_enabled = 1 }
+
     log::explanations("removing all existing urpmi media for upgrade");
     run_program::run('urpmi.removemedia', if_($root, '--urpmi-root', $root), '-a');
 
@@ -313,6 +319,9 @@
         exit(2);
     };
 
+    any::urpmi_enable_media("Nonfree") if $non_free_enabled;
+    any::urpmi_enable_media("Tainted") if $tainted_enabled;
+
     if ($add_pwp_auth) {
         log::explanations("adding restricted (powerpack) media");

Actions: View | Diff

Attachments on bug 6061: 3075 | 3622 | 3623 | 3876 | 3878 | 3904 | 3914 | 3915 | 3916 | 3935