Merge pull request #749 from dmarcotte/fix_dash_s_spec

Fix dash_s_spec
jruby · May 19, 2013 · 3cd83a9 · 3cd83a9
2 parents fe118a0 + 9b96e9f
commit 3cd83a9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/spec/tags/1.8/ruby/command_line/dash_s_tags.txt b/spec/tags/1.8/ruby/command_line/dash_s_tags.txt
diff --git a/spec/tags/1.9/ruby/command_line/dash_s_tags.txt b/spec/tags/1.9/ruby/command_line/dash_s_tags.txt
diff --git a/src/org/jruby/util/cli/ArgumentProcessor.java b/src/org/jruby/util/cli/ArgumentProcessor.java
@@ -118,7 +118,10 @@ private void processArgv() {
                 arg = arg.substring(1);
                 if (arg.indexOf('=') > 0) {
                     String[] keyvalue = arg.split("=", 2);
-                    config.getOptionGlobals().put(keyvalue[0], keyvalue[1]);
+
+                    // argv globals get their dashes replaced with underscores
+                    String globalName = keyvalue[0].replaceAll("-", "_");
+                    config.getOptionGlobals().put(globalName, keyvalue[1]);
                 } else {
                     config.getOptionGlobals().put(arg, null);
                 }