packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtins/commit: Switch to using ostree_repo_write_dfd_to_mtree() 

Where we're referencing local files.  It's what
ostree_repo_write_directory_to_mtree() is doing internally anyways,
and I consider the `GFile*` based APIs to be generally deprecated for
the most part.

Closes: #394
Approved by: giuseppe
This commit is contained in:
Colin Walters 2016-07-13 11:46:16 -04:00 committed by Atomic Bot
parent f45eca948c
commit efa1fa6534
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ostree/ot-builtin-commit.c
View File

@ -455,12 +455,8 @@ ostree_builtin_commit (int argc, char **argv, GCancellable *cancellable, GError
if (argc <= 1 && (opt_trees == NULL || opt_trees[0] == NULL)) if (argc <= 1 && (opt_trees == NULL || opt_trees[0] == NULL))
{ {
char *current_dir = g_get_current_dir (); if (!ostree_repo_write_dfd_to_mtree (repo, AT_FDCWD, ".", mtree, modifier,
object_to_commit = g_file_new_for_path (current_dir); cancellable, error))
g_free (current_dir);
if (!ostree_repo_write_directory_to_mtree (repo, object_to_commit, mtree, modifier,
cancellable, error))
goto out; goto out;
} }
else if (opt_trees != NULL) else if (opt_trees != NULL)
@ -487,9 +483,8 @@ ostree_builtin_commit (int argc, char **argv, GCancellable *cancellable, GError
g_clear_object (&object_to_commit); g_clear_object (&object_to_commit);
if (strcmp (tree_type, "dir") == 0) if (strcmp (tree_type, "dir") == 0)
{ {
object_to_commit = g_file_new_for_path (tree); if (!ostree_repo_write_dfd_to_mtree (repo, AT_FDCWD, tree, mtree, modifier,
if (!ostree_repo_write_directory_to_mtree (repo, object_to_commit, mtree, modifier, cancellable, error))
cancellable, error))
goto out; goto out;
} }
else if (strcmp (tree_type, "tar") == 0) else if (strcmp (tree_type, "tar") == 0)
@ -520,9 +515,8 @@ ostree_builtin_commit (int argc, char **argv, GCancellable *cancellable, GError
else else
{ {
g_assert (argc > 1); g_assert (argc > 1);
object_to_commit = g_file_new_for_path (argv[1]); if (!ostree_repo_write_dfd_to_mtree (repo, AT_FDCWD, argv[1], mtree, modifier,
if (!ostree_repo_write_directory_to_mtree (repo, object_to_commit, mtree, modifier, cancellable, error))
cancellable, error))
goto out; goto out;
} }