Merge pull request #1023 from drewfish/dupe-libs

fix issue 812: only walk the first/shallowest version of each package
YahooArchive · Mar 7, 2013 · fb1e90b · fb1e90b
2 parents 6e80f52 + afa3c10
commit fb1e90b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/app/autoload/store.server.js b/lib/app/autoload/store.server.js
@@ -1683,7 +1683,7 @@ YUI.add('mojito-resource-store', function(Y, NAME) {
             if (!info.pkg.yahoo || !info.pkg.yahoo.mojito) {
                 return;
             }
-            visitKey = [info.pkg.name, info.pkg.version].join('@');
+            visitKey = info.pkg.name;
             if (this._packagesVisited[visitKey]) {
                 Y.log('skipping duplicate package ' + visitKey + '\nskipping  ' +
                       info.dir + '\nprev used ' + this._packagesVisited[visitKey], 'info', NAME);

diff --git a/tests/unit/lib/app/autoload/test-store.server.js b/tests/unit/lib/app/autoload/test-store.server.js
@@ -525,7 +525,7 @@ YUI().use(
                 var oldlog = Y.log;
                 var logged = false;
                 Y.log = function(msg, lvl, src) {
-                    if ('info' === lvl && 'mojito-resource-store' === src && msg.match(/^skipping duplicate package a@666\.1\.0/)) {
+                    if ('info' === lvl && 'mojito-resource-store' === src && msg.match(/^skipping duplicate package a/)) {
                         logged = true;
                     }
                 };