diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-31 09:45:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 09:45:26 -0400 |
| commit | 3352e8b0e6bb77344a4470ef86b2d2dc6262a668 (patch) | |
| tree | 3aa275c9a348f02ed2c6638fcea57e04c21b5aa1 /vendor/github.com/google/uuid/marshal.go | |
| parent | 24a335b0aeedfb04dea5b0d498b5984458f73779 (diff) | |
| parent | cf147050d40296d15ec92cb97b55351cc236735e (diff) | |
| download | podman-3352e8b0e6bb77344a4470ef86b2d2dc6262a668.tar.gz podman-3352e8b0e6bb77344a4470ef86b2d2dc6262a668.tar.bz2 podman-3352e8b0e6bb77344a4470ef86b2d2dc6262a668.zip | |
Merge pull request #7507 from containers/dependabot/go_modules/github.com/google/uuid-1.1.2
Bump github.com/google/uuid from 1.1.1 to 1.1.2
Diffstat (limited to 'vendor/github.com/google/uuid/marshal.go')
| -rw-r--r-- | vendor/github.com/google/uuid/marshal.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vendor/github.com/google/uuid/marshal.go b/vendor/github.com/google/uuid/marshal.go index 7f9e0c6c0..14bd34072 100644 --- a/vendor/github.com/google/uuid/marshal.go +++ b/vendor/github.com/google/uuid/marshal.go @@ -16,10 +16,11 @@ func (uuid UUID) MarshalText() ([]byte, error) { // UnmarshalText implements encoding.TextUnmarshaler. func (uuid *UUID) UnmarshalText(data []byte) error { id, err := ParseBytes(data) - if err == nil { - *uuid = id + if err != nil { + return err } - return err + *uuid = id + return nil } // MarshalBinary implements encoding.BinaryMarshaler. |