Merge lp:~sergiusens/goget-ubuntu-touch/downloadRace into lp:goget-ubuntu-touch

[Sergio Schvezov]

Avoid data races when downloading

[John Lenton (chipaca)]

review: Approve

=== modified file 'ubuntu-device-flash/snappy.go'
--- ubuntu-device-flash/snappy.go	2015-06-24 13:56:08 +0000
+++ ubuntu-device-flash/snappy.go	2015-06-24 13:56:08 +0000
@@ -470,17 +470,18 @@
 	}
 
 	filesChan := make(chan Files, len(systemImage.Files))
-	defer close(filesChan)
-
 	sigFiles := ubuntuimage.GetGPGFiles()
-	sigFilesChan := make(chan Files, len(sigFiles))
-	defer close(sigFilesChan)
 
 	fmt.Println("Downloading and setting up...")
 
-	for _, f := range sigFiles {
-		go bitDownloader(f, sigFilesChan, globalArgs.Server, cacheDir)
-	}
+	go func() {
+		sigFilesChan := make(chan Files, len(sigFiles))
+		defer close(sigFilesChan)
+
+		for _, f := range sigFiles {
+			bitDownloader(f, sigFilesChan, globalArgs.Server, cacheDir)
+		}
+	}()
 
 	filePathChan := make(chan string, len(systemImage.Files))
 	hwChan := make(chan diskimage.HardwareDescription)
@@ -503,6 +504,7 @@
 			filePathChan <- f.FilePath
 		}
 		close(hwChan)
+		close(filesChan)
 	}()
 
 	for _, f := range systemImage.Files {