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

Drop some bits from libotutil that are now merged in libgsystem

Browse Source
This commit is contained in:
Colin Walters committed 2012-11-29 16:24:49 -05:00
1 parent d1ddfc973c
commit 5761733218
19 files changed
+104 -205
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/libostree/ostree-core.c
+6 -6
View File
@@ -169,7 +169,7 @@ ostree_get_xattrs_for_file (GFile *f,
GVariantBuilder builder;
gboolean builder_initialized = FALSE;
path = ot_gfile_get_path_cached (f);
path = gs_file_get_path_cached (f);
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ayay)"));
builder_initialized = TRUE;
@@ -769,7 +769,7 @@ ostree_set_xattrs (GFile *f,
gboolean ret = FALSE;
int i, n;
path = ot_gfile_get_path_cached (f);
path = gs_file_get_path_cached (f);
n = g_variant_n_children (xattrs);
for (i = 0; i < n; i++)
@@ -1146,11 +1146,11 @@ ostree_create_file_from_input (GFile *dest_file,
{
mode = S_IFREG | 0664;
}
dest_path = ot_gfile_get_path_cached (dest_file);
dest_path = gs_file_get_path_cached (dest_file);
if (S_ISDIR (mode))
{
if (mkdir (ot_gfile_get_path_cached (dest_file), mode) < 0)
if (mkdir (gs_file_get_path_cached (dest_file), mode) < 0)
{
ot_util_set_error_from_errno (error, errno);
goto out;
@@ -1302,7 +1302,7 @@ ostree_create_temp_file_from_input (GFile *dir,
ot_lfree guchar *ret_csum = NULL;
GString *tmp_name = NULL;
tmp_name = create_tmp_string (ot_gfile_get_path_cached (dir),
tmp_name = create_tmp_string (gs_file_get_path_cached (dir),
prefix, suffix);
/* 128 attempts seems reasonable... */
@@ -1394,7 +1394,7 @@ ostree_create_temp_dir (GFile *dir,
dir = g_file_new_for_path (g_get_tmp_dir ());
template = g_strdup_printf ("%s/%s-XXXXXX",
ot_gfile_get_path_cached (dir),
gs_file_get_path_cached (dir),
prefix ? prefix : "tmp");
if (mkdtemp (template) == NULL)
src/libostree/ostree-diff.c
+3 -3
View File
@@ -378,11 +378,11 @@ ostree_diff_print (GFile *base,
for (i = 0; i < modified->len; i++)
{
OstreeDiffItem *diff = modified->pdata[i];
g_print ("M %s\n", ot_gfile_get_path_cached (diff->src));
g_print ("M %s\n", gs_file_get_path_cached (diff->src));
}
for (i = 0; i < removed->len; i++)
{
g_print ("D %s\n", ot_gfile_get_path_cached (removed->pdata[i]));
g_print ("D %s\n", gs_file_get_path_cached (removed->pdata[i]));
}
for (i = 0; i < added->len; i++)
{
@@ -395,6 +395,6 @@ ostree_diff_print (GFile *base,
g_free (relpath);
}
else
g_print ("A %s\n", ot_gfile_get_path_cached (added_f));
g_print ("A %s\n", gs_file_get_path_cached (added_f));
}
}
src/libostree/ostree-repo-file.c
+6 -6
View File
@@ -105,7 +105,7 @@ set_error_noent (GFile *self, GError **error)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
"No such file or directory: %s",
ot_gfile_get_path_cached (self));
gs_file_get_path_cached (self));
return FALSE;
}
@@ -473,7 +473,7 @@ ostree_repo_file_get_uri (GFile *file)
char *uri_path;
char *ret;
path = ot_gfile_get_path_cached (file);
path = gs_file_get_path_cached (file);
uri_path = g_filename_to_uri (path, NULL, NULL);
g_assert (g_str_has_prefix (uri_path, "file://"));
ret = g_strconcat ("ostree://", self->commit, uri_path+strlen("file://"), NULL);
@@ -565,8 +565,8 @@ ostree_repo_file_prefix_matches (GFile *parent,
const char *parent_path;
const char *descendant_path;
parent_path = ot_gfile_get_path_cached (parent);
descendant_path = ot_gfile_get_path_cached (descendant);
parent_path = gs_file_get_path_cached (parent);
descendant_path = gs_file_get_path_cached (descendant);
remainder = match_prefix (descendant_path, parent_path);
if (remainder != NULL && G_IS_DIR_SEPARATOR (*remainder))
return TRUE;
@@ -581,8 +581,8 @@ ostree_repo_file_get_relative_path (GFile *parent,
const char *parent_path;
const char *descendant_path;
parent_path = ot_gfile_get_path_cached (parent);
descendant_path = ot_gfile_get_path_cached (descendant);
parent_path = gs_file_get_path_cached (parent);
descendant_path = gs_file_get_path_cached (descendant);
remainder = match_prefix (descendant_path, parent_path);
if (remainder != NULL && G_IS_DIR_SEPARATOR (*remainder))
src/libostree/ostree-repo.c
+29 -29
View File
@@ -131,7 +131,7 @@ ostree_repo_set_property(GObject *object,
{
case PROP_PATH:
/* Canonicalize */
self->repodir = g_file_new_for_path (ot_gfile_get_path_cached (g_value_get_object (value)));
self->repodir = g_file_new_for_path (gs_file_get_path_cached (g_value_get_object (value)));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -422,7 +422,7 @@ ostree_repo_resolve_rev (OstreeRepo *self,
if (!ot_gfile_load_contents_utf8 (child, &ret_rev, NULL, NULL, &temp_error))
{
g_propagate_error (error, temp_error);
g_prefix_error (error, "Couldn't open ref '%s': ", ot_gfile_get_path_cached (child));
g_prefix_error (error, "Couldn't open ref '%s': ", gs_file_get_path_cached (child));
goto out;
}
@@ -614,11 +614,11 @@ ostree_repo_check (OstreeRepo *self, GError **error)
if (self->inited)
return TRUE;
if (!g_file_test (ot_gfile_get_path_cached (self->objects_dir), G_FILE_TEST_IS_DIR))
if (!g_file_test (gs_file_get_path_cached (self->objects_dir), G_FILE_TEST_IS_DIR))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Couldn't find objects directory '%s'",
ot_gfile_get_path_cached (self->objects_dir));
gs_file_get_path_cached (self->objects_dir));
goto out;
}
@@ -626,7 +626,7 @@ ostree_repo_check (OstreeRepo *self, GError **error)
goto out;
self->config = g_key_file_new ();
if (!g_key_file_load_from_file (self->config, ot_gfile_get_path_cached (self->config_file), 0, error))
if (!g_key_file_load_from_file (self->config, gs_file_get_path_cached (self->config_file), 0, error))
{
g_prefix_error (error, "Couldn't parse config file: ");
goto out;
@@ -672,7 +672,7 @@ ostree_repo_check (OstreeRepo *self, GError **error)
if (!ostree_repo_check (self->parent_repo, error))
{
g_prefix_error (error, "While checking parent repository '%s': ",
ot_gfile_get_path_cached (parent_repo_f));
gs_file_get_path_cached (parent_repo_f));
goto out;
}
}
@@ -756,7 +756,7 @@ ensure_file_data_synced (GFile *file,
gboolean ret = FALSE;
int fd = -1;
if (!ot_unix_open_noatime (ot_gfile_get_path_cached (file), &fd, error))
if (!ot_unix_open_noatime (gs_file_get_path_cached (file), &fd, error))
goto out;
if (!ot_unix_fdatasync (fd, error))
@@ -794,13 +794,13 @@ commit_loose_object_impl (OstreeRepo *self,
goto out;
}
if (rename (ot_gfile_get_path_cached (tempfile_path), ot_gfile_get_path_cached (dest)) < 0)
if (rename (gs_file_get_path_cached (tempfile_path), gs_file_get_path_cached (dest)) < 0)
{
if (errno != EEXIST)
{
ot_util_set_error_from_errno (error, errno);
g_prefix_error (error, "Storing file '%s': ",
ot_gfile_get_path_cached (dest));
gs_file_get_path_cached (dest));
goto out;
}
}
@@ -979,7 +979,7 @@ stage_object (OstreeRepo *self,
*/
target_mode |= (S_IRUSR | S_IRGRP | S_IROTH);
if (chmod (ot_gfile_get_path_cached (raw_temp_file), target_mode) < 0)
if (chmod (gs_file_get_path_cached (raw_temp_file), target_mode) < 0)
{
ot_util_set_error_from_errno (error, errno);
goto out;
@@ -1087,9 +1087,9 @@ stage_object (OstreeRepo *self,
ot_transfer_out_value(out_csum, &ret_csum);
out:
if (temp_file)
(void) unlink (ot_gfile_get_path_cached (temp_file));
(void) unlink (gs_file_get_path_cached (temp_file));
if (raw_temp_file)
(void) unlink (ot_gfile_get_path_cached (raw_temp_file));
(void) unlink (gs_file_get_path_cached (raw_temp_file));
g_clear_pointer (&checksum, (GDestroyNotify) g_checksum_free);
return ret;
}
@@ -1221,7 +1221,7 @@ scan_loose_devino (OstreeRepo *self,
if (!enumerator)
goto out;
dirname = ot_gfile_get_basename_cached (objdir);
dirname = gs_file_get_basename_cached (objdir);
while ((file_info = g_file_enumerator_next_file (enumerator, cancellable, &temp_error)) != NULL)
{
@@ -2572,7 +2572,7 @@ ostree_repo_stage_archive_to_mtree (OstreeRepo *self,
a = archive_read_new ();
archive_read_support_compression_all (a);
archive_read_support_format_all (a);
if (archive_read_open_filename (a, ot_gfile_get_path_cached (archive_f), 8192) != ARCHIVE_OK)
if (archive_read_open_filename (a, gs_file_get_path_cached (archive_f), 8192) != ARCHIVE_OK)
{
propagate_libarchive_error (error, a);
goto out;
@@ -2662,7 +2662,7 @@ list_loose_object_dir (OstreeRepo *self,
ot_lobj GFileInfo *file_info = NULL;
GString *checksum = NULL;
dirname = ot_gfile_get_basename_cached (dir);
dirname = gs_file_get_basename_cached (dir);
/* We're only querying name */
enumerator = g_file_enumerate_children (dir, "standard::name,standard::type",
@@ -2849,7 +2849,7 @@ ostree_repo_load_file (OstreeRepo *self,
ret_input = (GInputStream*) gs_file_read_noatime (loose_path, cancellable, error);
if (!ret_input)
{
g_prefix_error (error, "Error opening loose file object %s: ", ot_gfile_get_path_cached (loose_path));
g_prefix_error (error, "Error opening loose file object %s: ", gs_file_get_path_cached (loose_path));
goto out;
}
}
@@ -2896,7 +2896,7 @@ repo_find_object (OstreeRepo *self,
object_path = ostree_repo_get_object_path (self, checksum, objtype);
if (lstat (ot_gfile_get_path_cached (object_path), &stbuf) == 0)
if (lstat (gs_file_get_path_cached (object_path), &stbuf) == 0)
{
ret_stored_path = object_path;
object_path = NULL; /* Transfer ownership */
@@ -3163,7 +3163,7 @@ checkout_file_from_input (GFile *file,
goto out;
}
if (rename (ot_gfile_get_path_cached (temp_file), ot_gfile_get_path_cached (file)) < 0)
if (rename (gs_file_get_path_cached (temp_file), gs_file_get_path_cached (file)) < 0)
{
ot_util_set_error_from_errno (error, errno);
goto out;
@@ -3204,10 +3204,10 @@ checkout_file_hardlink (OstreeRepo *self,
ot_lobj GFile *dir = NULL;
if (dirfd != -1 &&
linkat (-1, ot_gfile_get_path_cached (source),
dirfd, ot_gfile_get_basename_cached (destination), 0) != -1)
linkat (-1, gs_file_get_path_cached (source),
dirfd, gs_file_get_basename_cached (destination), 0) != -1)
ret_was_supported = TRUE;
else if (link (ot_gfile_get_path_cached (source), ot_gfile_get_path_cached (destination)) != -1)
else if (link (gs_file_get_path_cached (source), gs_file_get_path_cached (destination)) != -1)
ret_was_supported = TRUE;
else if (errno == EMLINK || errno == EXDEV || errno == EPERM)
{
@@ -3226,8 +3226,8 @@ checkout_file_hardlink (OstreeRepo *self,
*
* So we can't make this atomic.
*/
(void) unlink (ot_gfile_get_path_cached (destination));
if (link (ot_gfile_get_path_cached (source), ot_gfile_get_path_cached (destination)) < 0)
(void) unlink (gs_file_get_path_cached (destination));
if (link (gs_file_get_path_cached (source), gs_file_get_path_cached (destination)) < 0)
{
ot_util_set_error_from_errno (error, errno);
goto out;
@@ -3284,7 +3284,7 @@ find_loose_for_checkout (OstreeRepo *self,
continue;
}
if (lstat (ot_gfile_get_path_cached (path), &stbuf) < 0)
if (lstat (gs_file_get_path_cached (path), &stbuf) < 0)
{
if (errno != ENOENT)
{
@@ -3403,7 +3403,7 @@ checkout_file_thread (GSimpleAsyncResult *result,
if (!ot_gfile_ensure_directory (objdir, TRUE, error))
{
g_prefix_error (error, "Creating cache directory %s: ",
ot_gfile_get_path_cached (objdir));
gs_file_get_path_cached (objdir));
goto out;
}
@@ -3455,7 +3455,7 @@ checkout_file_thread (GSimpleAsyncResult *result,
&hardlink_supported, cancellable, error))
{
g_prefix_error (error, "Hardlinking loose object %s to %s: ", checksum,
ot_gfile_get_path_cached (checkout_data->destination));
gs_file_get_path_cached (checkout_data->destination));
goto out;
}
}
@@ -3474,7 +3474,7 @@ checkout_file_thread (GSimpleAsyncResult *result,
input, cancellable, error))
{
g_prefix_error (error, "Copying object %s to %s: ", checksum,
ot_gfile_get_path_cached (checkout_data->destination));
gs_file_get_path_cached (checkout_data->destination));
goto out;
}
}
@@ -3797,7 +3797,7 @@ ostree_repo_checkout_tree_async (OstreeRepo *self,
cancellable, error))
goto out;
checkout_data->dir_handle = opendir (ot_gfile_get_path_cached (checkout_data->destination));
checkout_data->dir_handle = opendir (gs_file_get_path_cached (checkout_data->destination));
if (!checkout_data->dir_handle)
{
ot_util_set_error_from_errno (error, errno);
@@ -3887,7 +3887,7 @@ ostree_repo_checkout_gc (OstreeRepo *self,
{
ot_lobj GFile *objpath = NULL;
objpath = ot_gfile_get_child_build_path (objdir, g_file_info_get_name (file_info), NULL);
if (!ot_gfile_unlink (objpath, cancellable, error))
if (!gs_file_unlink (objpath, cancellable, error))
goto out;
}
g_object_unref (file_info);
src/libostree/ostree-sysroot.c
+1 -1
View File
@@ -84,7 +84,7 @@ ostree_run_triggers_in_root (GFile *root,
g_ptr_array_add (argv, "--mount-bind");
g_ptr_array_add (argv, "/dev");
g_ptr_array_add (argv, "/dev");
g_ptr_array_add (argv, (char*)ot_gfile_get_path_cached (root));
g_ptr_array_add (argv, (char*)gs_file_get_path_cached (root));
}
g_ptr_array_add (argv, "ostree-run-triggers");
g_ptr_array_add (argv, NULL);