summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2013-05-09 18:03:40 +0000
committerOlivier Blin <blino@mageia.org>2013-05-09 18:03:40 +0000
commit7a85c186c9c0bdf7213963c6ee93339e78ee4517 (patch)
treea6cea4438eff438c8ebc81b1a58c5ab8f9a22ce7 /perl-install/any.pm
parent2543990672ccaef0e7670f63e9cf662d5deaab8d (diff)
downloaddrakx-backup-do-not-use-7a85c186c9c0bdf7213963c6ee93339e78ee4517.tar
drakx-backup-do-not-use-7a85c186c9c0bdf7213963c6ee93339e78ee4517.tar.gz
drakx-backup-do-not-use-7a85c186c9c0bdf7213963c6ee93339e78ee4517.tar.bz2
drakx-backup-do-not-use-7a85c186c9c0bdf7213963c6ee93339e78ee4517.tar.xz
drakx-backup-do-not-use-7a85c186c9c0bdf7213963c6ee93339e78ee4517.zip
finish-install/installer: enable Nonfree/Tainted repositories if a package having a matching name is installed (#8379)
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm13
1 files changed, 13 insertions, 0 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 33afd1743..f153c1fb1 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -975,6 +975,19 @@ sub urpmi_add_all_media {
my $log_file = '/root/drakx/updates.log';
my $val = run_program::rooted($::prefix, $binary, '>>', $log_file, '2>>', $log_file, @options);
+
+ if ($val) {
+ #- enable Nonfree/Tainted repositories if a package having a matching name is installed
+ #- FIXME: this only works for Nonfree for now thanks to kernel-firmware-nonfree
+ #- for Tainted to work and for better Nonfree support, we should search in package releases as well
+ foreach my $media (qw(Nonfree Tainted)) {
+ $in->do_pkgs->are_installed("*" . lc($media) . "*") or next;
+ foreach my $type (qw(Release Updates)) {
+ run_program::rooted($::prefix, 'urpmi.update', '--no-ignore', "$media $type");
+ }
+ }
+ }
+
undef $wait;
$val;
}