Merge lp:~rsalveti/goget-ubuntu-touch/touch_serial_adb_push_vivid into lp:goget-ubuntu-touch/vivid

[Ricardo Salveti]

touch: don't use parallel adb push as that is not so reliable with arale

touch: don't use parallel adb push as that is not so reliable with arale

Unmerged revisions

143. By Ricardo Salveti on 2015-04-22

touch: don't use parallel adb push as that is not so reliable with arale

=== modified file 'ubuntu-device-flash/touch.go'
--- ubuntu-device-flash/touch.go	2015-02-10 05:51:08 +0000
+++ ubuntu-device-flash/touch.go	2015-04-22 21:04:07 +0000
@@ -306,19 +306,17 @@
 	}
 	for {
 		file := <-files
-		go func() {
-			log.Printf("Start pushing %s to device", file.FilePath)
-			err := adb.Push(file.FilePath, "/cache/recovery/")
-			if err != nil {
-				log.Fatal(err)
-			}
-			err = adb.Push(file.SigPath, "/cache/recovery/")
-			if err != nil {
-				log.Fatal(err)
-			}
-			log.Printf("Done pushing %s to device", file.FilePath)
-			done <- true
-		}()
+		log.Printf("Start pushing %s to device", file.FilePath)
+		err := adb.Push(file.FilePath, "/cache/recovery/")
+		if err != nil {
+			log.Fatal(err)
+		}
+		err = adb.Push(file.SigPath, "/cache/recovery/")
+		if err != nil {
+			log.Fatal(err)
+		}
+		log.Printf("Done pushing %s to device", file.FilePath)
+		done <- true
 	}
 }