github/bower
1
1
Fork 0
mirror of https://github.com/bower/bower.git synced 2026-04-24 03:00:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not install if there is a conflict.

Browse Source
This commit is contained in:
André Cruz
2012-10-18 20:41:01 +01:00
parent 712953e799
commit f335f5f1fb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/core/manager.js
View File

@@ -42,7 +42,8 @@ Manager.prototype.constructor = Manager;
Manager.prototype.resolve = function () {
var resolved = function () {
this.prune();
// If there is an error while pruning (conflict, abort installation)
if (!this.prune()) return this.emit('resolve');
this.on('install', this.emit.bind(this, 'resolve'));
this.install();
}.bind(this);
@@ -142,8 +143,9 @@ Manager.prototype.prune = function () {
this.dependencies = prune(this.getDeepDependencies());
} catch (err) {
this.emit('error', err);
return false;
}
return this;
return true;
};
Manager.prototype.install = function () {