summaryrefslogtreecommitdiffstats
path: root/perl-install
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
commit810c20b30855c80e33ae68ef5b0bc6373eb6d7ea (patch)
treea6cea4438eff438c8ebc81b1a58c5ab8f9a22ce7 /perl-install
parent85a02147a62deeaa1b8af0b3a8346f633ec94ce0 (diff)
downloaddrakx-810c20b30855c80e33ae68ef5b0bc6373eb6d7ea.tar
drakx-810c20b30855c80e33ae68ef5b0bc6373eb6d7ea.tar.gz
drakx-810c20b30855c80e33ae68ef5b0bc6373eb6d7ea.tar.bz2
drakx-810c20b30855c80e33ae68ef5b0bc6373eb6d7ea.tar.xz
drakx-810c20b30855c80e33ae68ef5b0bc6373eb6d7ea.zip
finish-install/installer: enable Nonfree/Tainted repositories if a package having a matching name is installed (#8379)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/any.pm13
-rw-r--r--perl-install/install/NEWS2
3 files changed, 17 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ceb909a96..1d442eef6 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- finish-install: enable Nonfree/Tainted repositories if a package
+ having a matching name is installed (#8379)
- detect_devices: check for phy80211 sysfs directory as well to detect
wireless devices
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;
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index cbc458ff7..a62d21ab5 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- enable Nonfree/Tainted repositories if a package having a matching
+ name is installed (similar to #8379)
- detect_devices: check for phy80211 sysfs directory as well to detect
wireless devices