Inline error check, and put back copyright deleted in error.

modongsongrio · May 25, 2017 · 8d4de70 · 8d4de70
1 parent 0d9e485
commit 8d4de70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/api/migrationmaster/client.go b/api/migrationmaster/client.go
@@ -345,8 +345,7 @@ func convertResourceRevision(app, name string, rev params.SerializedModelResourc
 	}
 	var fp charmresource.Fingerprint
 	if rev.FingerprintHex != "" {
-		fp, err = charmresource.ParseFingerprint(rev.FingerprintHex)
-		if err != nil {
+		if fp, err = charmresource.ParseFingerprint(rev.FingerprintHex); err != nil {
 			return empty, errors.Annotate(err, "invalid fingerprint")
 		}
 	}

diff --git a/resource/resourcetesting/resource.go b/resource/resourcetesting/resource.go
@@ -1,3 +1,4 @@
+// Copyright 2016 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 // This package provides helpers for testing with resources.