Attachment 3075 Details for Bug 6061 – Patch to re enable Tainted and Non Free repos on upgrade

[patch] Patch to re enable Tainted and Non Free repos on upgrade

bug6061.patch (text/plain), 1.57 KB, created by Derek Jennings on 2012-11-12 00:48:10 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Derek Jennings

Created: 2012-11-12 00:48:10 CET

Size: 1.57 KB

patch

obsolete

>--- /usr/sbin/mgaapplet-upgrade-helper	2012-11-11 23:36:10.094671393 +0000
>+++ mgaapplet-upgrade-helper	2012-11-11 23:40:23.941441325 +0000
>@@ -279,6 +279,13 @@
>     # 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;
>+    my $non_free_enabled;
>+    my  $tainted_enabled;
>+# Fix bug 6061   Note if Non-Free or Tainted media are enabled so they can be re enabled for upgraded system.
>+    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');
>@@ -312,7 +319,14 @@
>                     );
>         exit(2);
>     };
>-
>+    if ($non_free_enabled) { 
>+	system('urpmi.update', if_($root, "--urpmi-root=$root"), '--no-ignore', "Nonfree Release", "Nonfree Updates");
>+	log::explanations("Enabling Non Free media");
>+	 }
>+    if ($tainted_enabled) {
>+	system('urpmi.update', if_($root, "--urpmi-root=$root"), '--no-ignore', "Tainted Release", "Tainted Updates");
>+	log::explanations("Enabling Tainted media");
>+	 }
>     if ($add_pwp_auth) {
>         log::explanations("adding restricted (powerpack) media");
> 
>@@ -365,5 +379,5 @@
> }
> 
> sub update_media() {
>-    run_program::run('urpmi.update', if_($root, '--urpmi-root', $root), '-a', '--nocheck');
>+    run_program::run('urpmi.update', if_($root, '--urpmi-root', $root), '-a');
> }

--- /usr/sbin/mgaapplet-upgrade-helper	2012-11-11 23:36:10.094671393 +0000
+++ mgaapplet-upgrade-helper	2012-11-11 23:40:23.941441325 +0000
@@ -279,6 +279,13 @@
     # 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;
+    my $non_free_enabled;
+    my  $tainted_enabled;
+# Fix bug 6061   Note if Non-Free or Tainted media are enabled so they can be re enabled for upgraded system.
+    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');
@@ -312,7 +319,14 @@
                     );
         exit(2);
     };
-
+    if ($non_free_enabled) { 
+	system('urpmi.update', if_($root, "--urpmi-root=$root"), '--no-ignore', "Nonfree Release", "Nonfree Updates");
+	log::explanations("Enabling Non Free media");
+	 }
+    if ($tainted_enabled) {
+	system('urpmi.update', if_($root, "--urpmi-root=$root"), '--no-ignore', "Tainted Release", "Tainted Updates");
+	log::explanations("Enabling Tainted media");
+	 }
     if ($add_pwp_auth) {
         log::explanations("adding restricted (powerpack) media");
 
@@ -365,5 +379,5 @@
 }
 
 sub update_media() {
-    run_program::run('urpmi.update', if_($root, '--urpmi-root', $root), '-a', '--nocheck');
+    run_program::run('urpmi.update', if_($root, '--urpmi-root', $root), '-a');
 }

Actions: View | Diff

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