diff options
| author | Colin Walters <walters@verbum.org> | 2015-05-13 16:48:09 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2015-05-13 17:23:07 -0400 |
| commit | c10bc00249b444cd3f326af967208cc76ebb58ef (patch) | |
| tree | bb1026cee5745e5eda6a301f0f267476ff8d6fc7 /src/ostree/ot-admin-builtin-deploy.c | |
| parent | 06818ceddc5c04f67d07f0bcefda17c5c705a709 (diff) | |
| download | ostree-c10bc00249b444cd3f326af967208cc76ebb58ef.tar.gz | |
admin: Use locking for most sysroot commands
The previous commit introduced locking for `ostree admin deploy`, but
we do expect people to possibly accidentally do e.g.
`ostree admin upgrade` concurrently.
Using consistent locking in the admin commands will help rpm-ostree.
Closes: https://github.com/GNOME/ostree/pull/110
Diffstat (limited to 'src/ostree/ot-admin-builtin-deploy.c')
| -rw-r--r-- | src/ostree/ot-admin-builtin-deploy.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/ostree/ot-admin-builtin-deploy.c b/src/ostree/ot-admin-builtin-deploy.c index 78d60bb5..b054ece4 100644 --- a/src/ostree/ot-admin-builtin-deploy.c +++ b/src/ostree/ot-admin-builtin-deploy.c @@ -79,9 +79,6 @@ ot_admin_builtin_deploy (int argc, char **argv, GCancellable *cancellable, GErro refspec = argv[1]; - if (!ot_admin_sysroot_lock (sysroot, error)) - goto out; - if (!ostree_sysroot_load (sysroot, cancellable, error)) goto out; @@ -175,8 +172,6 @@ ot_admin_builtin_deploy (int argc, char **argv, GCancellable *cancellable, GErro ret = TRUE; out: - if (sysroot) - ostree_sysroot_unlock (sysroot); if (origin) g_key_file_unref (origin); if (context) |