From 3cfe173979bab9651a9ddb6735914b3c3536728a Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Sat, 29 Sep 2018 20:54:20 +0200
Subject: [PATCH] build script: log dowload finished

---
 build/gulpfile.vscode.js | 10 +++++++++-
 build/lib/extensions.js  | 12 +++++++-----
 build/lib/extensions.ts  | 13 +++++++------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 949ab1f1a73..83247db48bd 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -514,7 +514,7 @@ gulp.task('upload-vscode-sourcemaps', ['vscode-darwin-min', 'minify-vscode'], ()
 	const extensionsOut = gulp.src('extensions/**/out/**/*.map', { base: '.' });
 	const extensionsDist = gulp.src('extensions/**/dist/**/*.map', { base: '.' });
 
-	return es.merge(vs, extensionsOut, extensionsDist)
+	const res = es.merge(vs, extensionsOut, extensionsDist)
 		.pipe(es.through(function (data) {
 			// debug
 			console.log('Uploading Sourcemap', data.relative);
@@ -526,6 +526,14 @@ gulp.task('upload-vscode-sourcemaps', ['vscode-darwin-min', 'minify-vscode'], ()
 			container: 'sourcemaps',
 			prefix: commit + '/'
 		}));
+	res.on('error', (err) => {
+		console.log('ERROR uploading sourcemaps');
+		console.error(err);
+	});
+	res.on('end', () => {
+		console.log('Completed uploading sourcemaps');
+	});
+	return res;
 });
 
 const allConfigDetailsPath = path.join(os.tmpdir(), 'configuration.json');
diff --git a/build/lib/extensions.js b/build/lib/extensions.js
index e8c7840935e..c75c3c87457 100644
--- a/build/lib/extensions.js
+++ b/build/lib/extensions.js
@@ -150,11 +150,6 @@ function fromLocalNormal(extensionPath) {
         .catch(function (err) { return result.emit('error', err); });
     return result.pipe(stats_1.createStatsStream(path.basename(extensionPath)));
 }
-function error(err) {
-    var result = es.through();
-    setTimeout(function () { return result.emit('error', err); });
-    return result;
-}
 var baseHeaders = {
     'X-Market-Client-Id': 'VSCode Build',
     'User-Agent': 'VSCode Build',
@@ -173,6 +168,13 @@ function fromMarketplace(extensionName, version, metadata) {
     };
     var packageJsonFilter = filter('package.json', { restore: true });
     return remote('', options)
+        .on('error', function (err) {
+        console.log('Error downloading extension:', util.colors.yellow(extensionName + "@" + version));
+        console.error(err);
+    })
+        .on('end', function () {
+        console.log('Downloaded extension:', util.colors.yellow(extensionName + "@" + version));
+    })
         .pipe(vzip.src())
         .pipe(filter('extension/**'))
         .pipe(rename(function (p) { return p.dirname = p.dirname.replace(/^extension\/?/, ''); }))
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
index 6c248e20bb5..f1568672899 100644
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -174,12 +174,6 @@ function fromLocalNormal(extensionPath: string): Stream {
 	return result.pipe(createStatsStream(path.basename(extensionPath)));
 }
 
-function error(err: any): Stream {
-	const result = es.through();
-	setTimeout(() => result.emit('error', err));
-	return result;
-}
-
 const baseHeaders = {
 	'X-Market-Client-Id': 'VSCode Build',
 	'User-Agent': 'VSCode Build',
@@ -203,6 +197,13 @@ export function fromMarketplace(extensionName: string, version: string, metadata
 	const packageJsonFilter = filter('package.json', { restore: true });
 
 	return remote('', options)
+		.on('error', function (err) {
+			console.log('Error downloading extension:', util.colors.yellow(extensionName + "@" + version));
+			console.error(err);
+		})
+		.on('end', function () {
+			console.log('Downloaded extension:', util.colors.yellow(extensionName + "@" + version));
+		})
 		.pipe(vzip.src())
 		.pipe(filter('extension/**'))
 		.pipe(rename(p => p.dirname = p.dirname.replace(/^extension\/?/, '')))
-- 
GitLab