Merge pull request #1969 from chrisjons/svn_improvements

use --non-interactive when running svn client
bower · Oct 24, 2015 · 8f0a3d7 · 8f0a3d7
2 parents b6a524e + 4836a0c
commit 8f0a3d7
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/core/resolvers/SvnResolver.js b/lib/core/resolvers/SvnResolver.js
@@ -86,13 +86,13 @@ SvnResolver.prototype._export = function () {
     });
 
     if (resolution.type === 'commit') {
-        promise = cmd('svn', ['export', '--force', this._source + '/trunk', '-r' + resolution.commit, this._tempDir]);
+        promise = cmd('svn', ['export', '--force', '--non-interactive', this._source + '/trunk', '-r' + resolution.commit, this._tempDir]);
     } else if (resolution.type === 'branch' && resolution.branch === 'trunk') {
-        promise = cmd('svn', ['export', '--force', this._source + '/trunk', this._tempDir]);
+        promise = cmd('svn', ['export', '--force', '--non-interactive', this._source + '/trunk', this._tempDir]);
     } else if (resolution.type === 'branch') {
-        promise = cmd('svn', ['export', '--force', this._source + '/branches/' + resolution.branch, this._tempDir]);
+        promise = cmd('svn', ['export', '--force', '--non-interactive', this._source + '/branches/' + resolution.branch, this._tempDir]);
     } else {
-        promise = cmd('svn', ['export', '--force', this._source + '/tags/' + resolution.tag, this._tempDir]);
+        promise = cmd('svn', ['export', '--force', '--non-interactive', this._source + '/tags/' + resolution.tag, this._tempDir]);
     }
 
     // Throttle the progress reporter to 1 time each sec
@@ -324,7 +324,7 @@ SvnResolver.tags = function (source) {
         return Q.resolve(value);
     }
 
-    value = cmd('svn', ['list', source + '/tags', '--verbose'])
+    value = cmd('svn', ['list', source + '/tags', '--verbose', '--non-interactive'])
     .spread(function (stout) {
         var tags = SvnResolver.parseSubversionListOutput(stout.toString());
 
@@ -349,7 +349,7 @@ SvnResolver.branches = function (source) {
         return Q.resolve(value);
     }
 
-    value = cmd('svn', ['list', source + '/branches', '--verbose'])
+    value = cmd('svn', ['list', source + '/branches', '--verbose', '--non-interactive'])
     .spread(function (stout) {
         var branches = SvnResolver.parseSubversionListOutput(stout.toString());