From af34f50b8cc1e3992938b4869db656b0090a0026 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Sat, 17 Jun 2017 00:08:54 +0200 Subject: [PATCH] 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 }