summaryrefslogtreecommitdiff
path: root/vendor/github.com/google/uuid/marshal.go
diff options
context:
space:
mode:
authordependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>2020-08-31 08:17:19 +0000
committerDaniel J Walsh <dwalsh@redhat.com>2020-08-31 05:13:54 -0400
commitcf147050d40296d15ec92cb97b55351cc236735e (patch)
treee8195a54c89a4aa0d5a98654d5e9bfbbba594bbe /vendor/github.com/google/uuid/marshal.go
parent575b3a3d8ab4f1f72d58b71aa4d534eca3a5d8f9 (diff)
downloadpodman-cf147050d40296d15ec92cb97b55351cc236735e.tar.gz
podman-cf147050d40296d15ec92cb97b55351cc236735e.tar.bz2
podman-cf147050d40296d15ec92cb97b55351cc236735e.zip
Bump github.com/google/uuid from 1.1.1 to 1.1.2
Bumps [github.com/google/uuid](https://github.com/google/uuid) from 1.1.1 to 1.1.2. - [Release notes](https://github.com/google/uuid/releases) - [Commits](https://github.com/google/uuid/compare/v1.1.1...v1.1.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com/google/uuid/marshal.go')
-rw-r--r--vendor/github.com/google/uuid/marshal.go7
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.