From 15a55bd9f257454bee6d63c230acae750ae379de Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 9 Nov 2006 14:56:39 +0000 Subject: move basename() to urpm::util --- urpm.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'urpm.pm') diff --git a/urpm.pm b/urpm.pm index 8d217c2e..83475ae9 100644 --- a/urpm.pm +++ b/urpm.pm @@ -1224,7 +1224,7 @@ this could happen if you mounted manually the directory when creating the medium #- we can assume at this point a basename is existing, but it needs #- to be checked for being valid, nothing can be deduced if no MD5SUM #- file is present. - my $basename = urpm::download::basename($with_hdlist_dir); + my $basename = basename($with_hdlist_dir); unless ($medium->{virtual}) { if ($medium->{with_hdlist}) { @@ -1475,7 +1475,7 @@ this could happen if you mounted manually the directory when creating the medium #- we can assume at this point a basename is existing, but it needs #- to be checked for being valid, nothing can be deduced if no MD5SUM #- file is present. - $basename = urpm::download::basename($medium->{with_hdlist}); + $basename = basename($medium->{with_hdlist}); unlink "$urpm->{cachedir}/partial/MD5SUM"; eval { @@ -1541,7 +1541,7 @@ this could happen if you mounted manually the directory when creating the medium : _probe_with_try_list(_guess_hdlist_suffix($dir), $options{probe_with}) ); foreach my $with_hdlist (@probe_list) { - $basename = urpm::download::basename($with_hdlist) or next; + $basename = basename($with_hdlist) or next; $options{force} and unlink "$urpm->{cachedir}/partial/$basename"; eval { $urpm->{sync}( @@ -1565,7 +1565,7 @@ this could happen if you mounted manually the directory when creating the medium } } } else { - $basename = urpm::download::basename($medium->{with_hdlist}); + $basename = basename($medium->{with_hdlist}); #- try to sync (copy if needed) local copy after restored the previous one. $options{force} and unlink "$urpm->{cachedir}/partial/$basename"; @@ -3372,7 +3372,7 @@ sub check_sources_signatures { } } - map { ($options{basename} ? urpm::download::basename($_) : $_) . ($options{translate} ? ": $invalid_sources{$_}" : "") } + map { ($options{basename} ? basename($_) : $_) . ($options{translate} ? ": $invalid_sources{$_}" : "") } sort keys %invalid_sources; } -- cgit v1.2.1