From 9c182082022737973dd5b8681fc6f744de2fa737 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 30 Mar 2009 15:59:11 +0000 Subject: (_adjust_paths_in_urpmi_cfg) fix writing urpmi.cfg as cdrom:// for NFS (#49316) (regression introduced in r254610 on 2009-03-23: "(get_media,_adjust_paths_in_urpmi_cfg) only adjust newly added medium regarding current physical medium" --- perl-install/install/NEWS | 1 + perl-install/install/media.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'perl-install') diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index e36571c9c..9f608f9a7 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- fix writing urpmi.cfg as cdrom:// for NFS (#49316) - in order to guess the login name, just transliterate the real name into ascii rather than truncate it on first non ascii characte- diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm index afce601c9..ded64e867 100644 --- a/perl-install/install/media.pm +++ b/perl-install/install/media.pm @@ -543,7 +543,7 @@ sub get_media { sub _adjust_paths_in_urpmi_cfg { my ($o, $phys_m, @new_media) = @_; - if ($o->{stage2_phys_medium}{method} ne 'cdrom') { + if ($o->{stage2_phys_medium}{method} eq 'cdrom') { my $urpm = install::pkgs::empty_packages(); # force rereading media: undef $urpm->{media}; -- cgit v1.2.1