From: Nikola Knezevic Date: Wed, 6 Mar 2002 18:13:51 +0000 (+0100) Subject: reordering conditions in Win32.pm X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9c1370fb202eb56860da11d7695c846c33542694;p=p5sagit%2Fp5-mst-13.2.git reordering conditions in Win32.pm Message-ID: <16925657426.20020306181351@tesla.rcub.bg.ac.yu> p4raw-id: //depot/perl@15074 --- diff --git a/lib/File/Spec/Win32.pm b/lib/File/Spec/Win32.pm index c2e463b..ea9a620 100644 --- a/lib/File/Spec/Win32.pm +++ b/lib/File/Spec/Win32.pm @@ -266,12 +266,12 @@ sub abs2rel { } # Figure out the effective $base and clean it up. - if ( ! $self->file_name_is_absolute( $base ) ) { - $base = $self->rel2abs( $base ) ; - } - elsif ( !defined( $base ) || $base eq '' ) { + if ( !defined( $base ) || $base eq '' ) { $base = cwd() ; } + elsif ( ! $self->file_name_is_absolute( $base ) ) { + $base = $self->rel2abs( $base ) ; + } else { $base = $self->canonpath( $base ) ; }