Attachment 3915 Details for Bug 6061 – mgaapplet enable nonfree tainted during upgrade backported for mga2

[patch] mgaapplet enable nonfree tainted during upgrade backported for mga2

mgaapplet_enable_nonfree_tainted_during_upgrade-mga2.patch (text/plain), 964 bytes, created by AL13N on 2013-05-10 00:41:49 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: AL13N

Created: 2013-05-10 00:41:49 CEST

Size: 964 bytes

patch

obsolete

--- mgaapplet-upgrade-helper.orig	2012-04-22 01:55:46.000000000 +0200
+++ mgaapplet-upgrade-helper	2013-05-10 00:36:26.630999935 +0200
@@ -269,6 +269,13 @@
                     );
         exit(1);
     }
+
+    my @repos = ();
+
+    for my $media (@{$urpm->{media}}) {
+        push @repos, $media->{name} if (!defined($media->{ignore}));
+    }
+
     undef $urpmi_lock;
 
     touch(get_stale_upgrade_filename());
@@ -313,6 +320,11 @@
         exit(2);
     };
 
+    for my $repos (@repos) {
+        log::explanations("enabling '$repos' as it was there before upgrade");
+    }
+    enable_media(@repos);
+
     if ($add_pwp_auth) {
         log::explanations("adding restricted (powerpack) media");
 
@@ -367,3 +379,7 @@
 sub update_media() {
     run_program::run('urpmi.update', if_($root, '--urpmi-root', $root), '-a', '--nocheck');
 }
+
+sub enable_media {
+    run_program::run('urpmi.update', if_($root, '--urpmi-root', $root), '--no-ignore', @_);
+}

Actions: View | Diff

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