summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-02-26 18:23:10 +0000
committerThierry Vignaud <tv@mageia.org>2013-02-26 18:23:10 +0000
commitf25b4002b3b01eb0d65e4d3c879481e84ac9332c (patch)
tree029cc76cdfffe38e5a2e7bb10f3e39d3e77d7377 /perl-install
parenta1848d9968442b9fa467b56dbb6cc31053d7a6de (diff)
downloaddrakx-f25b4002b3b01eb0d65e4d3c879481e84ac9332c.tar
drakx-f25b4002b3b01eb0d65e4d3c879481e84ac9332c.tar.gz
drakx-f25b4002b3b01eb0d65e4d3c879481e84ac9332c.tar.bz2
drakx-f25b4002b3b01eb0d65e4d3c879481e84ac9332c.tar.xz
drakx-f25b4002b3b01eb0d65e4d3c879481e84ac9332c.zip
do not attempt to use gurpmi.addmedia or gurpmi if in text mode
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm2
3 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 6c6857cab..a8786dc89 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -968,7 +968,7 @@ sub sessions_with_order() {
sub urpmi_add_all_media {
my ($in, $o_previous_release) = @_;
- my $binary = find { whereis_binary($_, $::prefix) } 'gurpmi.addmedia', 'urpmi.addmedia' or return;
+ my $binary = find { whereis_binary($_, $::prefix) } if_(check_for_xserver(), 'gurpmi.addmedia'), 'urpmi.addmedia' or return;
#- configure urpmi media if network is up
require network::tools;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 98b442e47..60ed8a992 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- do not attempt to use gurpmi.addmedia or gurpmi if in text mode
+
Version 15.22 - 26 February 2013
- Mageia 3 beta 3 left background
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 1c549ca4c..1bfea5cd0 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -781,7 +781,7 @@ Do you want to install the updates?")),
install::pkgs::clean_rpmdb_shared_regions();
if (any::urpmi_add_all_media($o, $o->{previous_release})) {
- my $binary = find { whereis_binary($_, $::prefix) } 'gurpmi2', 'urpmi' or return;
+ my $binary = find { whereis_binary($_, $::prefix) } if_(check_for_xserver(), 'gurpmi2'), 'urpmi' or return;
my $log_file = '/root/drakx/updates.log';
run_program::rooted($::prefix, $binary, '>>', $log_file, '2>>', $log_file, '--auto-select');
}