[Pkg-javascript-commits] [node-module-deps] 323/444: extra case in record merge for only id

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-module-deps.

commit 11ef70adb718e7287bebe2eaa527248a954e45bc
Author: James Halliday <mail at substack.net>
Date:   Wed Dec 3 04:33:50 2014 -0800

    extra case in record merge for only id
---
 index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index 1d6ba19..669ee51 100644
--- a/index.js
+++ b/index.js
@@ -86,7 +86,7 @@ Deps.prototype._flush = function () {
     var self = this;
     var files = {};
     self._input.forEach(function (r) {
-        var w = r.row, f = files[w.file];
+        var w = r.row, f = files[w.file || w.id];
         if (f) {
             f.row.entry = f.row.entry || w.entry;
             var ex = f.row.expose || w.expose;
@@ -95,7 +95,7 @@ Deps.prototype._flush = function () {
                 f.row.id = w.id;
             }
         }
-        else files[w.file] = r;
+        else files[w.file || w.id] = r;
     });
     
     Object.keys(files).forEach(function (key) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-module-deps.git