summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2013-11-29 17:39:57 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-11-29 17:39:57 +0100
commitc5275f0b77863e5348435d0ed246e8cefdd8dffb (patch)
tree1b64d53905a913c0020668be093ddf6fd759479f /perl-install
parent4722ca4f3b0a21e254e0becbf763665910939a7d (diff)
downloaddrakx-c5275f0b77863e5348435d0ed246e8cefdd8dffb.tar
drakx-c5275f0b77863e5348435d0ed246e8cefdd8dffb.tar.gz
drakx-c5275f0b77863e5348435d0ed246e8cefdd8dffb.tar.bz2
drakx-c5275f0b77863e5348435d0ed246e8cefdd8dffb.tar.xz
drakx-c5275f0b77863e5348435d0ed246e8cefdd8dffb.zip
no more run urpmi.update when adding media
this is uneeded with urpmi-7.27+ basically reverting commit 810c20b3
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/any.pm12
-rw-r--r--perl-install/install/NEWS3
3 files changed, 6 insertions, 12 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 43aed295e..c6c378006 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,9 @@
o do not offer to switch to OSS
o do not offer to switch to another driver if there's none
o do not offer to pick a random driver when we've a default one
+- finish-install:
+ o no more run urpmi.update when adding media
+ (uneeded with urpmi-7.27+)
- mygtk3 layer:
o add support for RadioMenuItems for rpmdrake
- ugtk3 layer:
diff --git a/perl-install/any.pm b/perl-install/any.pm
index ea96ed8c6..27b505f82 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -976,18 +976,6 @@ 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, '/usr/libexec/urpmi.update', '--no-ignore', "$media $type");
- }
- }
- }
-
undef $wait;
$val;
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a195b285f..013caea5d 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- no more run urpmi.update when adding media
+ (uneeded with urpmi-7.27+)
+
Version 16.1 - 28 November 2013
- fix a warning: include dialog-warning-symbolic