[GitHub] wohali closed pull request #997: Allow couchspawnkillable to live in directories with spaces

[GitBox <gi...@apache.org>]

wohali closed pull request #997: Allow couchspawnkillable to live in directories with spaces
URL: https://github.com/apache/couchdb/pull/997
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/src/couchdb/couch_os_daemons.erl b/src/couchdb/couch_os_daemons.erl
index cac031a9bf..ebfd6571ff 100644
--- a/src/couchdb/couch_os_daemons.erl
+++ b/src/couchdb/couch_os_daemons.erl
@@ -197,7 +197,7 @@ start_port(Command) ->
 
 start_port(Command, EnvPairs) ->
     PrivDir = couch_util:priv_dir(),
-    Spawnkiller = filename:join(PrivDir, "couchspawnkillable"),
+    Spawnkiller = "\"" ++ filename:join(PrivDir, "couchspawnkillable") ++ "\"",
     Opts = case lists:keytake(env, 1, ?PORT_OPTIONS) of
         false ->
             ?PORT_OPTIONS ++ [ {env,EnvPairs} ];
diff --git a/src/couchdb/couch_os_process.erl b/src/couchdb/couch_os_process.erl
index db62d499e6..8ccf80bbbe 100644
--- a/src/couchdb/couch_os_process.erl
+++ b/src/couchdb/couch_os_process.erl
@@ -142,7 +142,7 @@ pick_command1(_) ->
 % gen_server API
 init([Command, Options, PortOptions]) ->
     PrivDir = couch_util:priv_dir(),
-    Spawnkiller = filename:join(PrivDir, "couchspawnkillable"),
+    Spawnkiller = "\"" ++ filename:join(PrivDir, "couchspawnkillable") ++ "\"",
     BaseProc = #os_proc{
         command=Command,
         port=open_port({spawn, Spawnkiller ++ " " ++ Command}, PortOptions),


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services