Attachment 3876 Details for Bug 6061 – enable nonfree/tainted during upgrade

[patch] enable nonfree/tainted during upgrade

mgaapplet_enable_nonfree_tainted_during_upgrade.patch (text/plain), 1.38 KB, created by AL13N on 2013-05-02 21:02:25 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: AL13N

Created: 2013-05-02 21:02:25 CEST

Size: 1.38 KB

patch

obsolete

>Index: mgaapplet-upgrade-helper
>===================================================================
>--- mgaapplet-upgrade-helper	(revision 8123)
>+++ mgaapplet-upgrade-helper	(working copy)
>@@ -230,6 +230,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());
>@@ -267,7 +282,17 @@
>         exit(2);
>     };
> 
>+    if ($nonfree) {
>+        log::explanations("enabling nonfree as it was there before upgrade");
>+	enable_media("Nonfree");
>+    }
> 
>+    if ($tainted) {
>+        log::explanations("enabling tained as it was there before upgrade");
>+	enable_media("Tainted");
>+    }
>+
>+
>     log::explanations("upgrading urpmi and rpmdrake");
>     log::explanations("upgrading the whole system");
> 
>@@ -296,3 +321,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");
>+}

Index: mgaapplet-upgrade-helper
===================================================================
--- mgaapplet-upgrade-helper	(revision 8123)
+++ mgaapplet-upgrade-helper	(working copy)
@@ -230,6 +230,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());
@@ -267,7 +282,17 @@
         exit(2);
     };
 
+    if ($nonfree) {
+        log::explanations("enabling nonfree as it was there before upgrade");
+	enable_media("Nonfree");
+    }
 
+    if ($tainted) {
+        log::explanations("enabling tained as it was there before upgrade");
+	enable_media("Tainted");
+    }
+
+
     log::explanations("upgrading urpmi and rpmdrake");
     log::explanations("upgrading the whole system");
 
@@ -296,3 +321,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