[Jython-checkins] SF.net SVN: jython:[6258] trunk/jython/src/org/python/util/jython.java

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

Revision: 6258
          http://jython.svn.sourceforge.net/jython/?rev=6258&view=rev
Author:   pjenvey
Date:     2009-04-23 07:45:20 +0000 (Thu, 23 Apr 2009)

Log Message:
-----------
omit the -h usage from an invalid -c argument (as -m does)
consequently this fixes test_cmd_line blocking on Windows. subprocess w/
stderr=PIPE seems to have issues there

Modified Paths:
--------------
    trunk/jython/src/org/python/util/jython.java

Modified: trunk/jython/src/org/python/util/jython.java
===================================================================
--- trunk/jython/src/org/python/util/jython.java	2009-04-23 07:38:49 UTC (rev 6257)
+++ trunk/jython/src/org/python/util/jython.java	2009-04-23 07:45:20 UTC (rev 6258)
@@ -126,7 +126,7 @@
                 System.err.println("Jython " + Version.PY_VERSION);
                 System.exit(0);
             }
-            if (!opts.runModule) {
+            if (!opts.runCommand && !opts.runModule) {
                 System.err.println(usage);
             }
 
@@ -339,7 +339,7 @@
 {
     public String filename;
     public boolean jar, interactive, notice;
-    public boolean runModule;
+    public boolean runCommand, runModule;
     public boolean fixInteractive;
     public boolean help, version;
     public String[] argv;
@@ -409,6 +409,7 @@
                 Options.importSite = false;
             }
             else if (arg.equals("-c")) {
+                runCommand = true;
                 if (arg.length() > 2) {
                     command = arg.substring(2);
                 }


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