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

reset: Simplify argument checking logic

This commit is contained in:
Matthew Barnes 2015-09-17 12:25:37 -04:00
parent 3267267115
commit 055b3aac32
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/ostree/ot-builtin-reset.c
View File

@ -31,24 +31,6 @@ static GOptionEntry options[] = {
{ NULL } { NULL }
}; };
static gchar *
find_current_ref (OstreeRepo *repo,
const gchar *ref,
GCancellable *cancellable,
GError **error)
{
g_autoptr(GHashTable) refs = NULL;
gchar *ret;
if (!ostree_repo_list_refs (repo, NULL, &refs, cancellable, error))
return NULL;
ret = g_strdup (g_hash_table_lookup (refs, ref));
if (ret == NULL)
g_set_error (error, G_IO_ERROR, G_IO_ERROR, "The ref was not found: %s", ref);
return ret;
}
gboolean gboolean
ostree_builtin_reset (int argc, ostree_builtin_reset (int argc,
char **argv, char **argv,
@ -57,10 +39,10 @@ ostree_builtin_reset (int argc,
{ {
GOptionContext *context; GOptionContext *context;
glnx_unref_object OstreeRepo *repo = NULL; glnx_unref_object OstreeRepo *repo = NULL;
g_autoptr(GHashTable) known_refs = NULL;
gboolean ret = FALSE; gboolean ret = FALSE;
const char *ref; const char *ref;
const char *target = NULL; const char *target = NULL;
g_autofree char *current = NULL;
g_autofree char *checksum = NULL; g_autofree char *checksum = NULL;
context = g_option_context_new ("REF COMMIT - Reset a REF to a previous COMMIT"); context = g_option_context_new ("REF COMMIT - Reset a REF to a previous COMMIT");
@ -79,11 +61,16 @@ ostree_builtin_reset (int argc,
ref = argv[1]; ref = argv[1];
target = argv[2]; target = argv[2];
if (!ostree_repo_resolve_rev (repo, target, FALSE, &checksum, error)) if (!ostree_repo_list_refs (repo, NULL, &known_refs, cancellable, error))
goto out; goto out;
current = find_current_ref (repo, ref, cancellable, error); if (!g_hash_table_contains (known_refs, ref))
if (current == NULL) {
g_set_error (error, G_IO_ERROR, G_IO_ERROR, "Invalid ref '%s'", ref);
goto out;
}
if (!ostree_repo_resolve_rev (repo, target, FALSE, &checksum, error))
goto out; goto out;
if (!ostree_repo_prepare_transaction (repo, NULL, cancellable, error)) if (!ostree_repo_prepare_transaction (repo, NULL, cancellable, error))