summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-03 22:43:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-03 22:43:54 +0000
commit87ccf7438dc42b7f611ecabfaf36ddfe29e345da (patch)
tree470fbd35a978961372526ce3b316b1d8fdc8c45a
parenta9718a22dc2d10c7d567d01907427136cc443951 (diff)
downloadurpmi-87ccf7438dc42b7f611ecabfaf36ddfe29e345da.tar
urpmi-87ccf7438dc42b7f611ecabfaf36ddfe29e345da.tar.gz
urpmi-87ccf7438dc42b7f611ecabfaf36ddfe29e345da.tar.bz2
urpmi-87ccf7438dc42b7f611ecabfaf36ddfe29e345da.tar.xz
urpmi-87ccf7438dc42b7f611ecabfaf36ddfe29e345da.zip
correctly name function since it's outside of its module
-rw-r--r--urpm/cdrom.pm2
-rw-r--r--urpm/removable.pm4
2 files changed, 3 insertions, 3 deletions
diff --git a/urpm/cdrom.pm b/urpm/cdrom.pm
index 117a12d4..a2b2e7c8 100644
--- a/urpm/cdrom.pm
+++ b/urpm/cdrom.pm
@@ -21,7 +21,7 @@ sub _find_blist_url_matching {
# set it, then verify
$blist->{medium}{mntpoint} = $mntpoint;
- if (-r urpm::removable::_file_or_synthesis_dir($blist->{medium}, $blist->{url})) {
+ if (-r urpm::removable::file_or_synthesis_dir($blist->{medium}, $blist->{url})) {
$urpm->{log}("found cdrom $blist->{medium}{name} mounted in $mntpoint");
push @l, $blist;
} else {
diff --git a/urpm/removable.pm b/urpm/removable.pm
index 93bc4270..ecc774e5 100644
--- a/urpm/removable.pm
+++ b/urpm/removable.pm
@@ -9,7 +9,7 @@ use urpm 'file_from_local_medium';
-sub _file_or_synthesis_dir {
+sub file_or_synthesis_dir {
my ($medium, $o_url) = @_;
urpm::media::_valid_synthesis_dir($medium) && !$o_url ?
@@ -47,7 +47,7 @@ sub _try_mounting_medium {
sub _try_mounting_local {
my ($urpm, $medium, $o_url) = @_;
- my $dir = _file_or_synthesis_dir($medium, $o_url);
+ my $dir = file_or_synthesis_dir($medium, $o_url);
-e $dir and return 1;
$medium->{iso} ? _try_mounting_iso($urpm, $dir, $medium->{iso}) : _try_mounting_using_fstab($urpm, $dir);