diff options
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | urpm/cdrom.pm | 4 | ||||
| -rw-r--r-- | urpm/util.pm | 2 |
3 files changed, 3 insertions, 4 deletions
@@ -1,4 +1,5 @@ - small Kwalitee cleanups +- stop truncating disk names when prompting for a CD/USB key - cpan_testers: o fix bundled genhdlist2 wrongly defaulting to zstd diff --git a/urpm/cdrom.pm b/urpm/cdrom.pm index 0396620b..16e255f7 100644 --- a/urpm/cdrom.pm +++ b/urpm/cdrom.pm @@ -4,7 +4,7 @@ package urpm::cdrom; use strict; use urpm::msg; use urpm::sys; -use urpm::util qw(basename copy_and_own difference2 remove_internal_name); +use urpm::util qw(basename copy_and_own difference2); use urpm::get_pkgs; use urpm::removable; use urpm 'file_from_local_medium'; @@ -174,7 +174,7 @@ sub _mount_cdrom { _may_eject_cdrom($urpm); - $ask_for_medium->(remove_internal_name($medium->{name})) + $ask_for_medium->($medium->{name}) or $urpm->{fatal}(4, N("medium \"%s\" is not available", $medium->{name})); } } diff --git a/urpm/util.pm b/urpm/util.pm index 7079e6ed..60a449d8 100644 --- a/urpm/util.pm +++ b/urpm/util.pm @@ -28,7 +28,6 @@ our @EXPORT = qw(add2hash_ put_in_hash quotespace reduce_pathname - remove_internal_name same_size_and_mtime uefi_type uniq @@ -44,7 +43,6 @@ sub max { my $n = shift; $_ > $n and $n = $_ foreach @_; $n } #- quoting/unquoting a string that may be containing space chars. sub quotespace { my $x = $_[0] || ''; $x =~ s/(\s)/\\$1/g; $x } sub unquotespace { my $x = $_[0] || ''; $x =~ s/\\(\s)/$1/g; $x } -sub remove_internal_name { my $x = $_[0] || ''; $x =~ s/\(\S+\)$/$1/g; $x } sub dirname { local $_ = shift; s|[^/]*/*\s*$||; s|(.)/*$|$1|; $_ || '.' } sub basename { local $_ = shift; s|/*\s*$||; s|.*/||; $_ } |