[Jython-checkins] SF.net SVN: jython:[6463] trunk/installer/src/java/org/python/util/install/ driver/NormalVerifier.java

[<pj...@us...>]

Revision: 6463
          http://jython.svn.sourceforge.net/jython/?rev=6463&view=rev
Author:   pjenvey
Date:     2009-06-06 21:41:26 +0000 (Sat, 06 Jun 2009)

Log Message:
-----------
revert the standalone jar workaround for now, we'll revisit this post 2.5

Modified Paths:
--------------
    trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java

Modified: trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java
===================================================================
--- trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java	2009-06-06 21:40:48 UTC (rev 6462)
+++ trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java	2009-06-06 21:41:26 UTC (rev 6463)
@@ -23,8 +23,7 @@
 
     private static final String BAT_EXTENSION = ".bat";
 
-    //TODO:Oti re-add an exclamation mark as soon subprocess/jython.bat can handle it
-    private static final String JYTHON_UP = "jython up and running";
+    private static final String JYTHON_UP = "jython up and running!";
 
     private static final String JYTHON = "jython";
 
@@ -270,23 +269,6 @@
         b.append("print '");
         b.append(JYTHON_UP);
         b.append("'\n");
-        b.append("# test subprocess if present\n");
-        b.append("try:\n");
-        b.append("  import subprocess\n");
-        b.append("  proceed=True\n");
-        b.append("except:\n");
-        b.append("  proceed=False\n");
-        b.append("if proceed:\n");
-        b.append("  print '");
-        b.append(VERIFYING);
-        b.append(" subprocess");
-        b.append("'\n");
-        b.append("  exitCode = subprocess.call([sys.executable, '-c', 'print ");
-        b.append('"');
-        b.append(JYTHON_UP);
-        b.append('"');
-        b.append("'])\n");
-        b.append("  assert exitCode==0\n");
         return b.toString();
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.