couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [1/2] git commit: Don't eat custom ERL_LIBS.
Date Tue, 04 Dec 2012 13:25:37 GMT
Updated Branches:
  refs/heads/1.3.x f1b230489 -> e2953fe1d
  refs/heads/master fb670f571 -> 811e49b86


Don't eat custom ERL_LIBS.

Patch by Volker Mische.

Closes COUCHDB-1621


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

Branch: refs/heads/1.3.x
Commit: e2953fe1defada4e3ef1efa9da5b733b4f9596a3
Parents: f1b2304
Author: Jan Lehnardt <jan@apache.org>
Authored: Tue Dec 4 14:24:04 2012 +0100
Committer: Jan Lehnardt <jan@apache.org>
Committed: Tue Dec 4 14:25:25 2012 +0100

----------------------------------------------------------------------
 bin/couchdb.tpl.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/e2953fe1/bin/couchdb.tpl.in
----------------------------------------------------------------------
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index 3d660e3..81bb8b8 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
@@ -232,7 +232,7 @@ start_couchdb () {
         interactive_option="+Bd -noinput"
     fi
     command="%ERL% $interactive_option $ERL_START_OPTIONS \
-        -env ERL_LIBS %localerlanglibdir% -couch_ini $start_arguments -s couch"
+        -env ERL_LIBS $ERL_LIBS:%localerlanglibdir% -couch_ini $start_arguments -s couch"
     if test "$BACKGROUND" = "true" -a "$RECURSED" = "false"; then
         $0 $background_start_arguments -b -r $RESPAWN_TIMEOUT -p $PID_FILE \
             -o $STDOUT_FILE -e $STDERR_FILE -R &


Mime
View raw message