Merge remote-tracking branch 'nfarina/master'

# Conflicts:
#	lib/plugin.js
This commit is contained in:
straccio
2016-11-28 13:36:00 +01:00
3 changed files with 17 additions and 13 deletions

View File

@@ -166,10 +166,12 @@ Plugin.installed = function() {
// reconstruct full path
var pluginPath = path.join(requirePath, name);
// we only care about directories
if (!fs.statSync(pluginPath).isDirectory()) continue;
try {
// we only care about directories
if (!fs.statSync(pluginPath).isDirectory()) continue;
} catch (e) {
continue;
}
// does this module contain a package.json?
var pjson;
try {