[svn:dbi] r14398 - dbi/trunk/lib/DBD

[hmbrand]

Author: hmbrand
Date: Mon Sep 13 23:10:39 2010
New Revision: 14398

Modified:
   dbi/trunk/lib/DBD/File.pm

Log:
tidy

Modified: dbi/trunk/lib/DBD/File.pm
==============================================================================
--- dbi/trunk/lib/DBD/File.pm   (original)
+++ dbi/trunk/lib/DBD/File.pm   Mon Sep 13 23:10:39 2010
@@ -792,9 +792,9 @@
        closedir $dh or croak "Can't close '$searchdir': $!";
 
        my $tmpfn = $file;
-       if ($ext and $req ) {
+       if ($ext && $req) {
             # File extension required
-            $tmpfn =~ s/$ext$//i                       or  return;
+            $tmpfn =~ s/$ext$//i or return;
             }
        }
 
@@ -806,7 +806,7 @@
     defined $meta->{f_lockfile} && $meta->{f_lockfile} and
        $meta->{f_fqln} = $meta->{f_fqbn} . $meta->{f_lockfile};
 
-    $dir and $tbl = File::Spec->catfile ($dir, $tbl) unless ($user_spec_file);
+    $dir && !$user_spec_file  and $tbl = File::Spec->catfile ($dir, $tbl);
     $meta->{table_name} = $tbl;
 
     return $tbl;