Fixed: Livesync both Android and iOS at the same time, only android updates

Author: Tsvetan Raikov

lib/npm-installation-manager.ts

@@ -106,6 +106,11 @@ export class NpmInstallationManager implements INpmInstallationManager {
 
 	public install(packageName: string, opts?: INpmInstallOptions): IFuture<string> {
 		return (() => {
+
+			while (this.$lockfile.check().wait()) {
+				;
+			}
+
 			this.$lockfile.lock().wait();
 
 			try {

lib/services/livesync/android-livesync-service.ts

@@ -7,7 +7,7 @@ import * as path from "path";
 import * as net from "net";
 
 class AndroidLiveSyncService extends liveSyncServiceBaseLib.LiveSyncServiceBase<Mobile.IAndroidDevice> implements IPlatformLiveSyncService {
-	private static BACKEND_PORT = 18181;
+	private static BACKEND_PORT = 18182;
 
 	constructor(_device: Mobile.IDevice,
 		private $fs: IFileSystem,

lib/tools/broccoli/builder.ts

@@ -34,6 +34,11 @@ export class Builder implements IBroccoliBuilder {
 					stat: true
 				}, (er: Error, files: string[]) => {
 					fiberBootstrap.run(() => {
+
+						while (this.$lockfile.check().wait()) {
+							;
+						}
+
 						this.$lockfile.lock().wait();
 						if (er) {
 							if (!future.isResolved()) {

test/stubs.ts

@@ -410,6 +410,11 @@ export class HooksServiceStub implements IHooksService {
 }
 
 export class LockFile {
+
+	check(): IFuture<boolean> {
+		return (() => { return false; }).future<boolean>()();
+	}
+
 	lock(): IFuture<void> {
 		return (() => {}).future<void>()();
 	}