diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-13 20:19:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-13 20:19:54 +0100 |
| commit | 225f22b9d5dfd0d1582a56530142fe8ffb960a91 (patch) | |
| tree | 4dcc994bb1e48602e5be5f42b7599abdc0cc7937 /vendor/github.com/Microsoft/hcsshim/layer.go | |
| parent | 15220af08ce2346686e54851a6d498ec573e950c (diff) | |
| parent | 6003033adae775f1d725b05231a246a4462ae669 (diff) | |
| download | podman-225f22b9d5dfd0d1582a56530142fe8ffb960a91.tar.gz podman-225f22b9d5dfd0d1582a56530142fe8ffb960a91.tar.bz2 podman-225f22b9d5dfd0d1582a56530142fe8ffb960a91.zip | |
Merge pull request #4506 from TomSweeneyRedHat/dev/tsweeney/bump_buildah1.11.5
Bump to Buildah v1.11.5
Diffstat (limited to 'vendor/github.com/Microsoft/hcsshim/layer.go')
| -rw-r--r-- | vendor/github.com/Microsoft/hcsshim/layer.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vendor/github.com/Microsoft/hcsshim/layer.go b/vendor/github.com/Microsoft/hcsshim/layer.go index df0e63bbd..f60ba5501 100644 --- a/vendor/github.com/Microsoft/hcsshim/layer.go +++ b/vendor/github.com/Microsoft/hcsshim/layer.go @@ -4,7 +4,7 @@ import ( "crypto/sha1" "path/filepath" - "github.com/Microsoft/hcsshim/internal/guid" + "github.com/Microsoft/go-winio/pkg/guid" "github.com/Microsoft/hcsshim/internal/wclayer" ) @@ -77,7 +77,7 @@ type GUID [16]byte func NameToGuid(name string) (id GUID, err error) { g, err := wclayer.NameToGuid(name) - return GUID(g), err + return g.ToWindowsArray(), err } func NewGUID(source string) *GUID { @@ -88,7 +88,7 @@ func NewGUID(source string) *GUID { } func (g *GUID) ToString() string { - return (guid.GUID)(*g).String() + return guid.FromWindowsArray(*g).String() } type LayerReader = wclayer.LayerReader |