couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [28/50] couchdb commit: updated refs/heads/auth-tests-wip to c34d871
Date Tue, 12 Jul 2016 19:41:11 GMT
Check for platform path separator instead of OS check


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a8e250b8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a8e250b8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a8e250b8

Branch: refs/heads/auth-tests-wip
Commit: a8e250b8e9983e61d5f881575410c7a0de9fb7b2
Parents: 03bbe21
Author: Joan Touzet <wohali@apache.org>
Authored: Mon Jun 20 01:55:58 2016 -0400
Committer: Joan Touzet <wohali@apache.org>
Committed: Mon Jun 20 01:55:58 2016 -0400

----------------------------------------------------------------------
 dev/run | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/a8e250b8/dev/run
----------------------------------------------------------------------
diff --git a/dev/run b/dev/run
index 81398d0..81140c4 100755
--- a/dev/run
+++ b/dev/run
@@ -174,7 +174,7 @@ def setup_configs(ctx):
             "fauxton_root": "src/fauxton/dist/release",
             "uuid": "fake_uuid_for_dev"
         }
-        if os.name == 'nt':
+        if os.sep == '\\':
             # Erlang always wants UNIX-style paths
             env["data_dir"] = env["data_dir"].replace("\\", "/")
             env["view_index_dir"] = env["view_index_dir"].replace("\\", "/")
@@ -237,7 +237,7 @@ def boot_haproxy(ctx):
 def hack_default_ini(ctx, node, content):
     # Replace log file
     logfile = os.path.join(ctx['devdir'], "logs", "%s.log" % node)
-    if os.name == 'nt':
+    if os.sep == '\\':
         # Erlang always wants UNIX-style paths
         logfile = logfile.replace("\\", "/")
     repl = "file = %s" % logfile
@@ -249,13 +249,13 @@ def hack_default_ini(ctx, node, content):
     coffeejs = os.path.join(ctx['rootdir'], "share", "server", "main-coffee.js")
 
     repl = "javascript = %s %s" % (couchjs, mainjs)
-    if os.name == 'nt':
+    if os.sep == '\\':
         # Erlang always wants UNIX-style paths
         repl = repl.replace("\\", "/")
     contents = re.sub("(?m)^javascript.*$", repl, contents)
 
     repl = "coffeescript = %s %s" % (couchjs, coffeejs)
-    if os.name == 'nt':
+    if os.sep == '\\':
         # Erlang always wants UNIX-style paths
         repl = repl.replace("\\", "/")
     contents = re.sub("(?m)^coffeescript.*$", repl, contents)
@@ -388,7 +388,7 @@ def boot_node(ctx, node):
     ]
     logfname = os.path.join(ctx['devdir'], "logs", "%s.log" % node)
     log = open(logfname, "wb")
-    if os.name == 'nt':
+    if os.sep == '\\':
         # Erlang always wants UNIX-style paths
         cmd = [x.replace("\\", "/") for x in cmd]
     return sp.Popen(cmd, stdin=sp.PIPE, stdout=log, stderr=sp.STDOUT, env=env)


Mime
View raw message