shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

tree-wide: Bump libglnx, port to new lockfile init

Browse Source 
In particular I'd like to get the copy fix in, since it might affect users for
the keyring bits.

Update submodule: libglnx

Closes: #1225
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-09-27 15:54:32 -04:00 committed by Atomic Bot
parent 5b860fba05
commit aa067aeafa
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libglnx

@ -1 +1 @@
Subproject commit e5856ca2939dca0589a836e3108dd3f9759e28fa Subproject commit e30154431d7eea6397e5502b175ba3b50330140f

2
src/libostree/ostree-repo-commit.c
View File

@ -1234,7 +1234,7 @@ cleanup_tmpdir (OstreeRepo *self,
guint64 delta; guint64 delta;
struct dirent *dent; struct dirent *dent;
struct stat stbuf; struct stat stbuf;
g_auto(GLnxLockFile) lockfile = GLNX_LOCK_FILE_INIT; g_auto(GLnxLockFile) lockfile = { 0, };
gboolean did_lock; gboolean did_lock;
if (!glnx_dirfd_iterator_next_dent (&dfd_iter, &dent, cancellable, error)) if (!glnx_dirfd_iterator_next_dent (&dfd_iter, &dent, cancellable, error))

2
src/libostree/ostree-repo.c
View File

@ -662,7 +662,6 @@ static void
ostree_repo_init (OstreeRepo *self) ostree_repo_init (OstreeRepo *self)
{ {
static gsize gpgme_initialized; static gsize gpgme_initialized;
GLnxLockFile empty_lockfile = GLNX_LOCK_FILE_INIT;
const GDebugKey test_error_keys[] = { const GDebugKey test_error_keys[] = {
{ "pre-commit", OSTREE_REPO_TEST_ERROR_PRE_COMMIT }, { "pre-commit", OSTREE_REPO_TEST_ERROR_PRE_COMMIT },
}; };
@ -690,7 +689,6 @@ ostree_repo_init (OstreeRepo *self)
self->tmp_dir_fd = -1; self->tmp_dir_fd = -1;
self->objects_dir_fd = -1; self->objects_dir_fd = -1;
self->uncompressed_objects_dir_fd = -1; self->uncompressed_objects_dir_fd = -1;
self->commit_stagedir_lock = empty_lockfile;
self->sysroot_kind = OSTREE_REPO_SYSROOT_KIND_UNKNOWN; self->sysroot_kind = OSTREE_REPO_SYSROOT_KIND_UNKNOWN;
} }

1
src/libostree/ostree-sysroot.c
View File

@ -197,7 +197,6 @@ ostree_sysroot_init (OstreeSysroot *self)
keys, G_N_ELEMENTS (keys)); keys, G_N_ELEMENTS (keys));
self->sysroot_fd = -1; self->sysroot_fd = -1;
self->lock = (GLnxLockFile)GLNX_LOCK_FILE_INIT;
} }
/** /**