From e7b32b1e6a5730ffbddf53e6fae6be5b18a02797 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Fri, 16 Jun 2017 23:39:06 +0200 Subject: [PATCH 1/2] vendor c/image for ListNames in transports pkg Signed-off-by: Antonio Murdaca --- .../containers/image/transports/transports.go | 13 +++++++++++++ vendor/github.com/containers/image/vendor.conf | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/vendor/github.com/containers/image/transports/transports.go b/vendor/github.com/containers/image/transports/transports.go index 03969be7..c932806d 100644 --- a/vendor/github.com/containers/image/transports/transports.go +++ b/vendor/github.com/containers/image/transports/transports.go @@ -2,6 +2,7 @@ package transports import ( "fmt" + "sort" "sync" "github.com/containers/image/types" @@ -69,3 +70,15 @@ func Register(t types.ImageTransport) { func ImageName(ref types.ImageReference) string { return ref.Transport().Name() + ":" + ref.StringWithinTransport() } + +// ListNames returns a list of transport names +func ListNames() []string { + kt.mu.Lock() + defer kt.mu.Unlock() + var names []string + for _, transport := range kt.transports { + names = append(names, transport.Name()) + } + sort.Strings(names) + return names +} diff --git a/vendor/github.com/containers/image/vendor.conf b/vendor/github.com/containers/image/vendor.conf index 6568715f..ffc6e67a 100644 --- a/vendor/github.com/containers/image/vendor.conf +++ b/vendor/github.com/containers/image/vendor.conf @@ -1,5 +1,5 @@ github.com/Sirupsen/logrus 7f4b1adc791766938c29457bed0703fb9134421a -github.com/containers/storage 29d2c86eadb88a0cbfbbedec8762126a3987d4c3 +github.com/containers/storage 989b1c1d85f5dfe2076c67b54289cc13dc836c8c github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76 github.com/docker/distribution df5327f76fb6468b84a87771e361762b8be23fdb github.com/docker/docker 75843d36aa5c3eaade50da005f9e0ff2602f3d5e @@ -34,3 +34,4 @@ github.com/xeipuuv/gojsonpointer master github.com/tchap/go-patricia v2.2.6 github.com/opencontainers/selinux ba1aefe8057f1d0cfb8e88d0ec1dc85925ef987d github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0 +github.com/ostreedev/ostree-go 61532f383f1f48e5c27080b0b9c8b022c3706a97 From af34f50b8cc1e3992938b4869db656b0090a0026 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Sat, 17 Jun 2017 00:08:54 +0200 Subject: [PATCH 2/2] bump ostree-go Signed-off-by: Antonio Murdaca --- vendor.conf | 2 +- .../ostreedev/ostree-go/pkg/otbuiltin/commit.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vendor.conf b/vendor.conf index 2ff91d75..19ab4b23 100644 --- a/vendor.conf +++ b/vendor.conf @@ -31,7 +31,7 @@ github.com/xeipuuv/gojsonschema master github.com/xeipuuv/gojsonreference master github.com/xeipuuv/gojsonpointer master go4.org master https://github.com/camlistore/go4 -github.com/ostreedev/ostree-go 75b58d2519fcee494d970944524ae124b2631845 +github.com/ostreedev/ostree-go aeb02c6b6aa2889db3ef62f7855650755befd460 # -- end OCI image validation requirements github.com/mtrmac/gpgme master # openshift/origin' k8s dependencies as of OpenShift v1.1.5 diff --git a/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/commit.go b/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/commit.go index 7842cf9f..9550f802 100644 --- a/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/commit.go +++ b/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/commit.go @@ -222,7 +222,7 @@ func (repo *Repo) Commit(commitPath, branch string, opts commitOptions) (string, filter_data.skip_list = (*C.GHashTable)(skipList.Ptr()) C._set_owner_uid((C.guint32)(options.OwnerUID)) C._set_owner_gid((C.guint32)(options.OwnerGID)) - modifier = C._ostree_repo_commit_modifier_new_wrapper(flags, &filter_data, nil) + modifier = C._ostree_repo_commit_modifier_new_wrapper(flags, C.gpointer(&filter_data), nil) } if strings.Compare(options.Parent, "") != 0 { @@ -245,7 +245,7 @@ func (repo *Repo) Commit(commitPath, branch string, opts commitOptions) (string, if len(commitPath) == 0 && (len(options.Tree) == 0 || len(options.Tree[0]) == 0) { currentDir := (*C.char)(C.g_get_current_dir()) objectToCommit = glib.ToGFile(unsafe.Pointer(C.g_file_new_for_path(currentDir))) - C.g_free(currentDir) + C.g_free(C.gpointer(currentDir)) if !glib.GoBool(glib.GBoolean(C.ostree_repo_write_directory_to_mtree(repo.native(), (*C.GFile)(objectToCommit.Ptr()), mtree, modifier, cancellable, &cerr))) { goto out @@ -469,14 +469,14 @@ func handleStatOverrideLine(line string, table *glib.GHashTable) error { } modeAdd = (C.guint)(C.g_ascii_strtod((*C.gchar)(C.CString(line)), nil)) - C.g_hash_table_insert((*C.GHashTable)(table.Ptr()), C.g_strdup((*C.gchar)(C.CString(line[space+1:]))), C._guint_to_pointer(modeAdd)) + C.g_hash_table_insert((*C.GHashTable)(table.Ptr()), C.gpointer(C.g_strdup((*C.gchar)(C.CString(line[space+1:])))), C._guint_to_pointer(modeAdd)) return nil } // Handle an individual line from a Skiplist file func handleSkipListline(line string, table *glib.GHashTable) error { - C.g_hash_table_add((*C.GHashTable)(table.Ptr()), C.g_strdup((*C.gchar)(C.CString(line)))) + C.g_hash_table_add((*C.GHashTable)(table.Ptr()), C.gpointer( C.g_strdup((*C.gchar)(C.CString(line))))) return nil }