pull: Check the remote repo type

We can only pull from archive repositories right now.  This will also
be useful for adding compressed archives later.
This commit is contained in:
Colin Walters committed 2012-09-15 12:41:25 -04:00
1 parent 31153913ff
commit 59ddbcc500
3 files changed
+84 -10

No files matched your search

+27 -10
View File
@@ -586,6 +586,31 @@ ostree_repo_write_config (OstreeRepo *self,
return ret;
}
gboolean
ostree_repo_mode_from_string (const char *mode,
OstreeRepoMode *out_mode,
GError **error)
{
gboolean ret = FALSE;
OstreeRepoMode ret_mode;
if (strcmp (mode, "bare") == 0)
ret_mode = OSTREE_REPO_MODE_BARE;
else if (strcmp (mode, "archive") == 0)
ret_mode = OSTREE_REPO_MODE_ARCHIVE;
else
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Invalid mode '%s' in repository configuration", mode);
goto out;
}
ret = TRUE;
*out_mode = ret_mode;
out:
return ret;
}
gboolean
ostree_repo_check (OstreeRepo *self, GError **error)
{
@@ -641,16 +666,8 @@ ostree_repo_check (OstreeRepo *self, GError **error)
"bare", &mode, error))
goto out;
if (strcmp (mode, "bare") == 0)
self->mode = OSTREE_REPO_MODE_BARE;
else if (strcmp (mode, "archive") == 0)
self->mode = OSTREE_REPO_MODE_ARCHIVE;
else
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Invalid mode '%s' in repository configuration", mode);
goto out;
}
if (!ostree_repo_mode_from_string (mode, &self->mode, error))
goto out;
}
if (!ot_keyfile_get_value_with_default (self->config, "core", "parent",
+4
View File
@@ -47,6 +47,10 @@ typedef enum {
OSTREE_REPO_MODE_ARCHIVE
} OstreeRepoMode;
gboolean ostree_repo_mode_from_string (const char *mode,
OstreeRepoMode *out_mode,
GError **error);
OstreeRepoMode ostree_repo_get_mode (OstreeRepo *self);
GFile * ostree_repo_get_tmpdir (OstreeRepo *self);