Attachment 3878 Details for Bug 6061 – Patch from comment 40 modified to work with current testing version

[patch] Patch from comment 40 modified to work with current testing version

mgaapplet-upgrade-helper.patch (text/plain), 1.37 KB, created by Dave Hodgins on 2013-05-03 01:09:34 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Hodgins

Created: 2013-05-03 01:09:34 CEST

Size: 1.37 KB

patch

obsolete

>--- /usr/sbin/mgaapplet-upgrade-helper.orig	2013-04-27 06:29:18.000000000 -0400
>+++ /usr/sbin/mgaapplet-upgrade-helper	2013-05-02 18:30:19.994936148 -0400
>@@ -313,6 +313,21 @@
>                     );
>         exit(1);
>     }
>+
>+    my $nonfree = 0;
>+    my $tainted = 0;
>+
>+    for my $media (@{$urpm->{media}}) {
>+        if (!defined($media->{ignore})) {
>+            if ($media->{name} =~ m/^Nonfree/) {
>+                $nonfree = 1;
>+            }
>+            if ($media->{name} =~ m/^Tainted/) {
>+                $tainted = 1;
>+            }
>+        }
>+    }
>+
>     undef $urpmi_lock;
> 
>     touch(get_stale_upgrade_filename());
>@@ -379,6 +394,15 @@
>                 );
>             exit(2);            
>         }
>+    if ($nonfree) {
>+        log::explanations("enabling nonfree as it was there before upgrade");
>+       enable_media("Nonfree");
>+    }
>+
>+    if ($tainted) {
>+        log::explanations("enabling tainted as it was there before upgrade");
>+       enable_media("Tainted");
>+    }
>         # Media was added, update it and move along...
>         update_media();
>     }
>@@ -411,3 +435,8 @@
> sub update_media() {
>     run_program::run('urpmi.update', if_($root, '--urpmi-root', $root), '-a', '--nocheck');
> }
>+
>+sub enable_media {
>+    my ($repos) = @_;
>+    run_program::run('urpmi.update', if_($root, '--urpmi-root', $root), '--no-ignore', "$repos Release", "$repos Tainted");
>+}

--- /usr/sbin/mgaapplet-upgrade-helper.orig	2013-04-27 06:29:18.000000000 -0400
+++ /usr/sbin/mgaapplet-upgrade-helper	2013-05-02 18:30:19.994936148 -0400
@@ -313,6 +313,21 @@
                     );
         exit(1);
     }
+
+    my $nonfree = 0;
+    my $tainted = 0;
+
+    for my $media (@{$urpm->{media}}) {
+        if (!defined($media->{ignore})) {
+            if ($media->{name} =~ m/^Nonfree/) {
+                $nonfree = 1;
+            }
+            if ($media->{name} =~ m/^Tainted/) {
+                $tainted = 1;
+            }
+        }
+    }
+
     undef $urpmi_lock;
 
     touch(get_stale_upgrade_filename());
@@ -379,6 +394,15 @@
                 );
             exit(2);            
         }
+    if ($nonfree) {
+        log::explanations("enabling nonfree as it was there before upgrade");
+       enable_media("Nonfree");
+    }
+
+    if ($tainted) {
+        log::explanations("enabling tainted as it was there before upgrade");
+       enable_media("Tainted");
+    }
         # Media was added, update it and move along...
         update_media();
     }
@@ -411,3 +435,8 @@
 sub update_media() {
     run_program::run('urpmi.update', if_($root, '--urpmi-root', $root), '-a', '--nocheck');
 }
+
+sub enable_media {
+    my ($repos) = @_;
+    run_program::run('urpmi.update', if_($root, '--urpmi-root', $root), '--no-ignore', "$repos Release", "$repos Tainted");
+}

Actions: View | Diff

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