add merge callback and missing err param for merge callback.

jolira · Oct 26, 2012 · 3bb9f9a · 3bb9f9a
1 parent 9c987a9
commit 3bb9f9a
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -63,6 +63,7 @@
 
                 return result[key] = value;
             }
+            return value;
         });
 
         return batch.end(function (err) {
@@ -84,7 +85,7 @@
                 }
 
                 if (content) {
-                    return merge(result, content, function (result) {
+                    return merge(result, content, function (err, result) {
                         if (err) {
                             return cb(err, result);
                         }
@@ -97,7 +98,13 @@
             });
         }
 
-        return loadConfigs(args, merge(result, config), cb);
+        return merge(result, config, function (err, result) {
+            if (err) {
+                return cb(err, result);
+            }
+
+            return loadConfigs(args, result, cb);
+        });
     }
 
     module.exports = function () {
@@ -133,4 +140,4 @@
 
         return value;
     };
-})(module);
+})(module);