Merge lp:~elopio/snappy/fix1496515-go_vet_missing_return into lp:~snappy-dev/snappy/15.04-deprecated

[Leo Arias]

Fixed the vet check: added the missing return of the error in rsync helper.

[John Lenton (chipaca)]

15.04-deprecated is deprecated \o/

review: Disapprove

Unmerged revisions

480. By Leo Arias on 2015-09-16

Fixed the vet check: added the missing return of the error in rsync helper.

=== modified file 'helpers/helpers.go'
--- helpers/helpers.go	2015-06-04 15:00:44 +0000
+++ helpers/helpers.go	2015-09-16 17:51:20 +0000
@@ -396,7 +396,7 @@
 			// XXX: on snappy-trunk we can use CopyFile here
 			output, err := exec.Command("cp", "-va", src, dst).CombinedOutput()
 			if err != nil {
-				fmt.Errorf("Failed to copy %s to %s (%s)", src, dst, output)
+				return fmt.Errorf("Failed to copy %s to %s (%s)", src, dst, output)
 			}
 		}
 		return nil