Skip to content

lib/repo: Refactor object copy import function #923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cgwalters wants to merge 3 commits into from
Closed

lib/repo: Refactor object copy import function #923

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ecb047
lib/repo: Refactor object copy import function
cgwalters Jun 12, 2017
7a78d7a
fixup! lib/repo: Refactor object copy import function
cgwalters Jun 12, 2017
8b997a5
fixup! lib/repo: Refactor object copy import function
cgwalters Jun 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 71 additions & 80 deletions src/libostree/ostree-repo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3049,77 +3049,6 @@ copy_detached_metadata (OstreeRepo *self,
return TRUE;
}

static gboolean
import_one_object_copy (OstreeRepo *self,
OstreeRepo *source,
const char *checksum,
OstreeObjectType objtype,
gboolean trusted,
GCancellable *cancellable,
GError **error)
{
guint64 length;
g_autoptr(GInputStream) object_stream = NULL;

if (!ostree_repo_load_object_stream (source, objtype, checksum,
&object_stream, &length,
cancellable, error))
return FALSE;

if (objtype == OSTREE_OBJECT_TYPE_FILE)
{
if (trusted)
{
if (!ostree_repo_write_content_trusted (self, checksum,
object_stream, length,
cancellable, error))
return FALSE;
}
else
{
g_autofree guchar *real_csum = NULL;
if (!ostree_repo_write_content (self, checksum,
object_stream, length,
&real_csum,
cancellable, error))
return FALSE;
}
}
else
{
if (objtype == OSTREE_OBJECT_TYPE_COMMIT)
{
if (!copy_detached_metadata (self, source, checksum, cancellable, error))
return FALSE;
}

if (trusted)
{
if (!ostree_repo_write_metadata_stream_trusted (self, objtype,
checksum, object_stream, length,
cancellable, error))
return FALSE;
}
else
{
g_autofree guchar *real_csum = NULL;
g_autoptr(GVariant) variant = NULL;

if (!ostree_repo_load_variant (source, objtype, checksum,
&variant, error))
return FALSE;

if (!ostree_repo_write_metadata (self, objtype,
checksum, variant,
&real_csum,
cancellable, error))
return FALSE;
}
}

return TRUE;
}

static gboolean
import_one_object_link (OstreeRepo *self,
OstreeRepo *source,
Expand Down Expand Up @@ -3216,29 +3145,91 @@ ostree_repo_import_object_from_with_trust (OstreeRepo *self,
GCancellable *cancellable,
GError **error)
{
gboolean hardlink_was_supported = FALSE;

if (trusted && /* Don't hardlink into untrusted remotes */
self->mode == source->mode)
{
gboolean hardlink_was_supported = FALSE;

if (!import_one_object_link (self, source, checksum, objtype,
&hardlink_was_supported,
cancellable, error))
return FALSE;

/* If we hardlinked, we're done! */
if (hardlink_was_supported)
return TRUE;
}

if (!hardlink_was_supported)
/* The copy path */

/* First, do we have the object already? */
gboolean has_object;
if (!ostree_repo_has_object (self, objtype, checksum, &has_object,
cancellable, error))
return FALSE;
/* If we have it, we're done */
if (has_object)
return TRUE;

if (OSTREE_OBJECT_TYPE_IS_META (objtype))
{
gboolean has_object;
/* Metadata object */
g_autoptr(GVariant) variant = NULL;

if (!ostree_repo_has_object (self, objtype, checksum, &has_object,
cancellable, error))
if (objtype == OSTREE_OBJECT_TYPE_COMMIT)
{
/* FIXME - cleanup detached metadata if copy below fails */
if (!copy_detached_metadata (self, source, checksum, cancellable, error))
return FALSE;
}

if (!ostree_repo_load_variant (source, objtype, checksum,
&variant, error))
return FALSE;

if (!has_object)
if (trusted)
{
if (!import_one_object_copy (self, source, checksum, objtype, trusted,
cancellable, error))
if (!ostree_repo_write_metadata_trusted (self, objtype,
checksum, variant,
cancellable, error))
return FALSE;
}
else
{
g_autofree guchar *real_csum = NULL;

if (!ostree_repo_write_metadata (self, objtype,
checksum, variant,
&real_csum,
cancellable, error))
return FALSE;
}
}
else
{
/* Content object */
guint64 length;
g_autoptr(GInputStream) object_stream = NULL;

if (!ostree_repo_load_object_stream (source, objtype, checksum,
&object_stream, &length,
cancellable, error))
return FALSE;

if (trusted)
{
if (!ostree_repo_write_content_trusted (self, checksum,
object_stream, length,
cancellable, error))
return FALSE;
}
else
{
g_autofree guchar *real_csum = NULL;
if (!ostree_repo_write_content (self, checksum,
object_stream, length,
&real_csum,
cancellable, error))
return FALSE;
}
}
Expand Down