Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D2AD4C38E for ; Mon, 30 Apr 2012 21:49:34 +0000 (UTC) Received: (qmail 91024 invoked by uid 500); 30 Apr 2012 21:49:34 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 90973 invoked by uid 500); 30 Apr 2012 21:49:34 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 90847 invoked by uid 99); 30 Apr 2012 21:49:34 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Apr 2012 21:49:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 670C413199; Mon, 30 Apr 2012 21:49:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dch@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merged pull request #19 from @maghoff with thanks Message-Id: <20120430214934.670C413199@tyr.zones.apache.org> Date: Mon, 30 Apr 2012 21:49:34 +0000 (UTC) Merged pull request #19 from @maghoff with thanks Fix failed loading of CommonJS modules that end in a line comment. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b7958ab4 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b7958ab4 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b7958ab4 Branch: refs/heads/1.2.x Commit: b7958ab46ad1576b6e796b41072553d5f10119a6 Parents: 81dd115 Author: Magnus Hoff Authored: Sat Apr 28 20:24:43 2012 +0200 Committer: Dave Cottlehuber Committed: Mon Apr 30 23:45:16 2012 +0200 ---------------------------------------------------------------------- share/server/util.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/b7958ab4/share/server/util.js ---------------------------------------------------------------------- diff --git a/share/server/util.js b/share/server/util.js index fca8856..3d40f0f 100644 --- a/share/server/util.js +++ b/share/server/util.js @@ -87,7 +87,7 @@ var Couch = { // create empty exports object before executing the module, // stops circular requires from filling the stack ddoc._module_cache[newModule.id] = {}; - var s = "function (module, exports, require) { " + newModule.current + " }"; + var s = "function (module, exports, require) { " + newModule.current + "\n }"; try { var func = sandbox ? evalcx(s, sandbox) : eval(s); func.apply(sandbox, [newModule, newModule.exports, function(name) {