Rename _canonpath to canonpath.

Signed-off-by: Modestas Vainius <modestas@vainius.eu>

diff --git a/Debian/Debhelper/Buildsystem.pm b/Debian/Debhelper/Buildsystem.pm
index e2037b5fe11322d36d6fb1ea7600cbe489baaf20..8fcb97e6d3b7ba513fbee1af0c313c31eb3184dd 100644 (file)
--- a/Debian/Debhelper/Buildsystem.pm
+++ b/Debian/Debhelper/Buildsystem.pm
@@ -84,7 +84,7 @@ sub _set_builddir {
 
        # Canonicalize. If build directory ends up the same as source directory, drop it
        if (defined $this->{builddir}) {
-               $this->{builddir} = $this->_canonpath($this->{builddir});
+               $this->{builddir} = $this->canonpath($this->{builddir});
                if ($this->{builddir} eq $this->get_sourcedir()) {
                        $this->{builddir} = undef;
                }
@@ -149,7 +149,7 @@ sub enforce_out_of_source_building {
 # Enhanced version of File::Spec::canonpath. It collapses ..
 # too so it may return invalid path if symlinks are involved.
 # On the other hand, it does not need for the path to exist.
-sub _canonpath {
+sub canonpath {
        my ($this, $path)=@_;
        my @canon;
        my $back=0;

diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 73ac2e300f6a86db98b7677851fbbbcc714812d9..bb502573819658a5c0130f0e9ce85487395a5f6f 100644 (file)
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -18,7 +18,7 @@ sub DESCRIPTION {
 
 sub DEFAULT_BUILD_DIRECTORY {
        my $this=shift;
-       return $this->_canonpath($this->get_sourcepath("build"));
+       return $this->canonpath($this->get_sourcepath("build"));
 }
 
 sub new {

diff --git a/t/buildsystems/buildsystem_tests b/t/buildsystems/buildsystem_tests
index e92e46f123eca827cff0ea0f4afa70e82a1a091d..0c4fcd5c98671f945bcc5b41e70c247c520bb13b 100755 (executable)
--- a/t/buildsystems/buildsystem_tests
+++ b/t/buildsystems/buildsystem_tests
@@ -57,13 +57,13 @@ sub process_stdout {
 }
 
 ### Test Buildsystem class API methods
-is( $BS_CLASS->_canonpath("path/to/the/./nowhere/../../somewhere"),
-    "path/to/somewhere", "_canonpath no1" );
-is( $BS_CLASS->_canonpath("path/to/../forward/../../somewhere"),
-    "somewhere","_canonpath no2" );
-is( $BS_CLASS->_canonpath("path/to/../../../somewhere"),
-    "../somewhere","_canonpath no3" );
-is( $BS_CLASS->_canonpath("./"), ".", "_canonpath no4" );
+is( $BS_CLASS->canonpath("path/to/the/./nowhere/../../somewhere"),
+    "path/to/somewhere", "canonpath no1" );
+is( $BS_CLASS->canonpath("path/to/../forward/../../somewhere"),
+    "somewhere","canonpath no2" );
+is( $BS_CLASS->canonpath("path/to/../../../somewhere"),
+    "../somewhere","canonpath no3" );
+is( $BS_CLASS->canonpath("./"), ".", "canonpath no4" );
 is( $BS_CLASS->_rel2rel("path/my/file", "path/my"),
     "file", "_rel2rel no1" );
 is( $BS_CLASS->_rel2rel("path/dir/file", "path/my"),