diff options
| author | Florent Villard <warly@mandriva.com> | 2004-03-17 16:57:42 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2004-03-17 16:57:42 +0000 |
| commit | dbb59de3655dd687ece09a0cdb6c3a3c290c2aa4 (patch) | |
| tree | 120c3bb3487d856a32968988eb5b1674a02be936 | |
| parent | 9fabb0abd6d5439c59d34a39af097e168064a8d7 (diff) | |
| download | urpmi-dbb59de3655dd687ece09a0cdb6c3a3c290c2aa4.tar urpmi-dbb59de3655dd687ece09a0cdb6c3a3c290c2aa4.tar.gz urpmi-dbb59de3655dd687ece09a0cdb6c3a3c290c2aa4.tar.bz2 urpmi-dbb59de3655dd687ece09a0cdb6c3a3c290c2aa4.tar.xz urpmi-dbb59de3655dd687ece09a0cdb6c3a3c290c2aa4.zip | |
do not display the urpmi internal name when asking for a media insertion
(confusing people with extra cdrom1, cdrom2 which does not refer to cdrom but hdlists)
| -rw-r--r-- | urpm.pm | 3 | ||||
| -rw-r--r-- | urpmi.spec | 6 |
2 files changed, 7 insertions, 2 deletions
@@ -115,6 +115,7 @@ sub set_proxy { #- quoting/unquoting a string that may be containing space chars. sub quotespace { local $_ = $_[0] || ''; s/(\s)/\\$1/g; $_ } sub unquotespace { local $_ = $_[0] || ''; s/\\(\s)/$1/g; $_ } +sub remove_internal_name { local $_ = $_[0] || ''; s/\(\S+\)$/$1/g; $_ } #- syncing algorithms, currently is implemented wget and curl methods, #- webfetch is trying to find the best (and one which will work :-) @@ -2875,7 +2876,7 @@ sub copy_packages_of_removable_media { while ($check_notfound->($id, $dir, 'removable')) { $options{ask_for_medium} or $urpm->{fatal}(4, N("medium \"%s\" is not selected", $medium->{name})); $urpm->try_umounting($dir); system("eject", $device); - $options{ask_for_medium}($medium->{name}, $medium->{removable}) or + $options{ask_for_medium}(remove_internal_name($medium->{name}), $medium->{removable}) or $urpm->{fatal}(4, N("medium \"%s\" is not selected", $medium->{name})); } if (-e $dir) { @@ -8,7 +8,7 @@ %define name urpmi %define version 4.4.5 -%define release 9mdk +%define release 10mdk %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"') @@ -243,6 +243,10 @@ $urpm->update_media(nolock => 1, nopubkey => 1); %{compat_perl_vendorlib}/urpm/parallel_ssh.pm %changelog +* Wed Mar 17 2004 Warly <warly@mandrakesoft.com> 4.4.5-10mdk +- do not display the urpmi internal name when asking for a media insertion +(confusing people with extra cdrom1, cdrom2 which does not refer to cdrom but hdlists) + * Tue Mar 16 2004 Frederic Crozat <fcrozat@mandrakesoft.com> 4.4.5-9mdk - fix mimetype in menu file (correct separator is , not ;) |