Attachment 3916 Details for Bug 6061 – Working patch

[patch] Working patch

mgaapplet-upgrade-helper.patch (text/plain), 2.01 KB, created by Dave Hodgins on 2013-05-10 03:31:13 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Hodgins

Created: 2013-05-10 03:31:13 CEST

Size: 2.01 KB

patch

obsolete

>--- /usr/sbin/mgaapplet-upgrade-helper.original	2013-04-27 06:29:18.000000000 -0400
>+++ /usr/sbin/mgaapplet-upgrade-helper	2013-05-09 21:25:38.521922971 -0400
>@@ -313,6 +313,26 @@
>                     );
>         exit(1);
>     }
>+
>+    my $nonfree = 0;
>+    my $tainted = 0;
>+
>+    log::explanations("Checking for enabled Nonfree/Tainted");
>+    for my $media (@{$urpm->{media}}) {
>+        log::explanations("Checking $media->{name}");
>+        if (!defined($media->{ignore})) {
>+            log::explanations("Media $media->{name} is not ignored"); 
>+            if ($media->{name} =~ m/^Nonfree/) {
>+                $nonfree = 1;
>+                log::explanations("Nonfree found to be enabled");
>+            }
>+            if ($media->{name} =~ m/^Tainted/) {
>+                $tainted = 1;
>+                log::explanations("Tainted found to be enabled");
>+            }
>+        }
>+    }
>+
>     undef $urpmi_lock;
> 
>     touch(get_stale_upgrade_filename());
>@@ -379,10 +399,22 @@
>                 );
>             exit(2);            
>         }
>-        # Media was added, update it and move along...
>-        update_media();
>     }
> 
>+    log::explanations("About to enable nonfree if $nonfree is 1");
>+    if ($nonfree) {
>+        log::explanations("enabling nonfree as it was there before upgrade");
>+       enable_media("Nonfree");
>+    }
>+
>+    log::explanations("About to enable Tainted if $tainted is 1");
>+    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();
>+
>     log::explanations("upgrading urpmi and rpmdrake");
>     log::explanations("upgrading the whole system");
> 
>@@ -411,3 +443,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 Updates");
>+}

--- /usr/sbin/mgaapplet-upgrade-helper.original	2013-04-27 06:29:18.000000000 -0400
+++ /usr/sbin/mgaapplet-upgrade-helper	2013-05-09 21:25:38.521922971 -0400
@@ -313,6 +313,26 @@
                     );
         exit(1);
     }
+
+    my $nonfree = 0;
+    my $tainted = 0;
+
+    log::explanations("Checking for enabled Nonfree/Tainted");
+    for my $media (@{$urpm->{media}}) {
+        log::explanations("Checking $media->{name}");
+        if (!defined($media->{ignore})) {
+            log::explanations("Media $media->{name} is not ignored"); 
+            if ($media->{name} =~ m/^Nonfree/) {
+                $nonfree = 1;
+                log::explanations("Nonfree found to be enabled");
+            }
+            if ($media->{name} =~ m/^Tainted/) {
+                $tainted = 1;
+                log::explanations("Tainted found to be enabled");
+            }
+        }
+    }
+
     undef $urpmi_lock;
 
     touch(get_stale_upgrade_filename());
@@ -379,10 +399,22 @@
                 );
             exit(2);            
         }
-        # Media was added, update it and move along...
-        update_media();
     }
 
+    log::explanations("About to enable nonfree if $nonfree is 1");
+    if ($nonfree) {
+        log::explanations("enabling nonfree as it was there before upgrade");
+       enable_media("Nonfree");
+    }
+
+    log::explanations("About to enable Tainted if $tainted is 1");
+    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();
+
     log::explanations("upgrading urpmi and rpmdrake");
     log::explanations("upgrading the whole system");
 
@@ -411,3 +443,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 Updates");
+}

Actions: View | Diff

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