[Python-modules-commits] r24379 - in packages/python-jpype/trunk/debian/patches (1 file)

[takaki at users.alioth.debian.org]

    Date: Wednesday, May 15, 2013 @ 04:29:47
  Author: takaki
Revision: 24379

return empty string getting env var

Modified:
  packages/python-jpype/trunk/debian/patches/default_jvm_path

Modified: packages/python-jpype/trunk/debian/patches/default_jvm_path
===================================================================
--- packages/python-jpype/trunk/debian/patches/default_jvm_path	2013-05-15 04:05:23 UTC (rev 24378)
+++ packages/python-jpype/trunk/debian/patches/default_jvm_path	2013-05-15 04:29:47 UTC (rev 24379)
@@ -1,7 +1,7 @@
 Index: python-jpype-0.5.4.2/src/python/jpype/_linux.py
 ===================================================================
---- python-jpype-0.5.4.2.orig/src/python/jpype/_linux.py	2011-07-27 22:17:06.000000000 +0900
-+++ python-jpype-0.5.4.2/src/python/jpype/_linux.py	2013-05-15 12:58:23.162450945 +0900
+--- python-jpype-0.5.4.2.orig/src/python/jpype/_linux.py	2013-05-15 13:18:27.704339655 +0900
++++ python-jpype-0.5.4.2/src/python/jpype/_linux.py	2013-05-15 13:23:59.229960405 +0900
 @@ -17,7 +17,8 @@
  
  import os, re
@@ -26,12 +26,16 @@
  def getDefaultJVMPath() :
      jvm = _getJVMFromJavaHome()
      if jvm is not None :
-@@ -47,7 +45,7 @@
+@@ -47,10 +45,10 @@
          # TODO
          pass
  
 -    return "/usr/java/jre1.5.0_05/lib/i386/client/libjvm.so"
-+    return "/usr/lib/jvm/default-jvm/jre/lib/%s/server/libjvm.so" $ arch
++    return "/usr/lib/jvm/default-java/jre/lib/%s/server/libjvm.so" % dpkg_arch
          
  def _getJVMFromJavaHome():
- 	java_home = os.getenv("JAVA_HOME")
+-	java_home = os.getenv("JAVA_HOME")
++	java_home = os.getenv("JAVA_HOME", '')
+ 	rootJre = None
+ 	if os.path.exists(java_home+"/bin/javac") :
+ 		# this is a JDK home