[svn:dbd-oracle] r15113 - dbd-oracle/trunk

Author: mjevans
Date: Tue Jan 31 09:23:17 2012
New Revision: 15113

Modified:
   dbd-oracle/trunk/Makefile.PL

Log:
Patch from Rafael Kitover (Caelum) for RT 74544
NOTE, Yanick, didn't change Changes file as the one in trunk is not the same as the
one you released as 1.38 - could you fix and add a changelog please.


Modified: dbd-oracle/trunk/Makefile.PL
==============================================================================
--- dbd-oracle/trunk/Makefile.PL	(original)
+++ dbd-oracle/trunk/Makefile.PL	Tue Jan 31 09:23:17 2012
@@ -994,14 +994,14 @@
 	  eval {
 	      require Win32::TieRegistry;
 	      $Win32::TieRegistry::Registry->Delimiter("/");
-	      $req_ok = 1;
-	      $hkey = $Win32::TieRegistry::Registry->{"LMachine/SOFTWARE/Oracle/"};
+	      $hkey = $Win32::TieRegistry::Registry->{"LMachine/SOFTWARE/Oracle/"}
+                  and $req_ok = 1;
 	  };
 	  eval { # older name of Win32::TieRegistry
 	      require Tie::Registry;
 	      $Tie::Registry::Registry->Delimiter("/");
-	      $req_ok = 1;
-	      $hkey = $Tie::Registry::Registry->{"LMachine/SOFTWARE/Oracle/"};
+	      $hkey = $Tie::Registry::Registry->{"LMachine/SOFTWARE/Oracle/"}
+                  and $req_ok = 1;
 	  } unless $req_ok;
 	  eval {
 	     $default_home = $hkey->{ORACLE_HOME} || '';