couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woh...@apache.org
Subject [1/2] couch commit: updated refs/heads/master to a468b0d
Date Mon, 12 Sep 2016 19:52:59 GMT
Repository: couchdb-couch
Updated Branches:
  refs/heads/master 7d0cfb5f9 -> a468b0db6


Fix Windows version string determination

For some reason, the COUCHD_VERSION string on Windows is getting
suffixed whitespace. We fix this by string:strip(Version0, right) on the
variable before use.


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

Branch: refs/heads/master
Commit: 70b61f08618c34f4604bebc2ad2b8d71f90cca5e
Parents: 7d0cfb5
Author: Joan Touzet <wohali@atypical.net>
Authored: Mon Sep 12 15:28:31 2016 -0400
Committer: Joan Touzet <wohali@atypical.net>
Committed: Mon Sep 12 15:28:31 2016 -0400

----------------------------------------------------------------------
 rebar.config.script      | 2 +-
 src/couch.app.src.script | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/70b61f08/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 7d803b9..8e4ea13 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -36,7 +36,7 @@ Version = case os:getenv("COUCHDB_VERSION") of
     false ->
         string:strip(os:cmd("git describe --always"), right, $\n);
     Version0 ->
-        Version0
+        string:strip(Version0, right)
 end,
 
 CouchConfig = case filelib:is_file(os:getenv("COUCHDB_CONFIG")) of

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/70b61f08/src/couch.app.src.script
----------------------------------------------------------------------
diff --git a/src/couch.app.src.script b/src/couch.app.src.script
index 40d922e..60a9345 100644
--- a/src/couch.app.src.script
+++ b/src/couch.app.src.script
@@ -15,7 +15,7 @@ Version = case os:getenv("COUCHDB_VERSION") of
     false ->
         string:strip(os:cmd("git describe --always"), right, $\n);
     Version0 ->
-        Version0
+        string:strip(Version0, right)
 end,
 
 


Mime
View raw message