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

sysroot: Make origin parsing code fd-relative 

Just more API conversion.
This commit is contained in:
Colin Walters 2015-03-05 18:42:22 -05:00
parent 68ce554202
commit a282f94f5d
2 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libglnx

@ -1 +1 @@
Subproject commit 162d1f6b58c9b501f47080e99aa1fd36864a89f9 Subproject commit 175502e5bee236123d27adf4be01e8ba8fe2b178

65
src/libostree/ostree-sysroot.c
View File

@ -478,23 +478,37 @@ read_current_bootversion (OstreeSysroot *self,
static gboolean static gboolean
parse_origin (OstreeSysroot *self, parse_origin (OstreeSysroot *self,
GFile *deployment_path, int deployment_dfd,
const char *deployment_name,
GKeyFile **out_origin, GKeyFile **out_origin,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
GKeyFile *ret_origin = NULL; g_autoptr(GKeyFile) ret_origin = NULL;
gs_unref_object GFile *origin_path = ostree_sysroot_get_deployment_origin_path (deployment_path); g_autofree char *origin_path = g_strconcat ("../", deployment_name, ".origin", NULL);
struct stat stbuf;
gs_free char *origin_contents = NULL; gs_free char *origin_contents = NULL;
if (!ot_gfile_load_contents_utf8_allow_noent (origin_path, &origin_contents, ret_origin = g_key_file_new ();
cancellable, error))
goto out;
if (origin_contents) if (fstatat (deployment_dfd, origin_path, &stbuf, 0) != 0)
{ {
ret_origin = g_key_file_new (); if (errno == ENOENT)
;
else
{
glnx_set_error_from_errno (error);
goto out;
}
}
else
{
origin_contents = glnx_file_get_contents_utf8_at (deployment_dfd, origin_path,
NULL, cancellable, error);
if (!origin_contents)
goto out;
if (!g_key_file_load_from_data (ret_origin, origin_contents, -1, 0, error)) if (!g_key_file_load_from_data (ret_origin, origin_contents, -1, 0, error))
goto out; goto out;
} }
@ -503,7 +517,7 @@ parse_origin (OstreeSysroot *self,
gs_transfer_out_value (out_origin, &ret_origin); gs_transfer_out_value (out_origin, &ret_origin);
out: out:
if (error) if (error)
g_prefix_error (error, "Parsing %s: ", gs_file_get_path_cached (origin_path)); g_prefix_error (error, "Parsing %s: ", origin_path);
if (ret_origin) if (ret_origin)
g_key_file_unref (ret_origin); g_key_file_unref (ret_origin);
return ret; return ret;
@ -567,11 +581,15 @@ parse_deployment (OstreeSysroot *self,
gs_free char *osname = NULL; gs_free char *osname = NULL;
gs_free char *bootcsum = NULL; gs_free char *bootcsum = NULL;
gs_free char *treecsum = NULL; gs_free char *treecsum = NULL;
gs_unref_object GFile *treebootserial_link = NULL; glnx_fd_close int deployment_dfd = -1;
gs_unref_object GFileInfo *treebootserial_info = NULL; const char *deploy_basename;
gs_unref_object GFile *treebootserial_target = NULL; g_autofree char *treebootserial_target = NULL;
g_autofree char *deploy_dir = NULL;
GKeyFile *origin = NULL; GKeyFile *origin = NULL;
if (!ensure_sysroot_fd (self, error))
goto out;
if (!parse_bootlink (boot_link, &entry_boot_version, if (!parse_bootlink (boot_link, &entry_boot_version,
&osname, &bootcsum, &treebootserial, &osname, &bootcsum, &treebootserial,
error)) error))
@ -580,27 +598,28 @@ parse_deployment (OstreeSysroot *self,
relative_boot_link = boot_link; relative_boot_link = boot_link;
if (*relative_boot_link == '/') if (*relative_boot_link == '/')
relative_boot_link++; relative_boot_link++;
treebootserial_link = g_file_resolve_relative_path (self->path, relative_boot_link);
treebootserial_info = g_file_query_info (treebootserial_link, OSTREE_GIO_FAST_QUERYINFO, treebootserial_target = glnx_readlinkat_malloc (self->sysroot_fd, relative_boot_link,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, cancellable, error);
cancellable, error); if (!treebootserial_target)
if (!treebootserial_info)
goto out; goto out;
if (!ot_gfile_get_symlink_target_from_info (treebootserial_link, treebootserial_info, deploy_basename = glnx_basename (treebootserial_target);
&treebootserial_target, cancellable, error))
goto out;
if (!_ostree_sysroot_parse_deploy_path_name (gs_file_get_basename_cached (treebootserial_target), if (!_ostree_sysroot_parse_deploy_path_name (deploy_basename,
&treecsum, &deployserial, error)) &treecsum, &deployserial, error))
goto out; goto out;
if (!parse_origin (self, treebootserial_target, &origin, if (!glnx_opendirat (self->sysroot_fd, relative_boot_link, TRUE,
&deployment_dfd, error))
goto out;
if (!parse_origin (self, deployment_dfd, deploy_basename, &origin,
cancellable, error)) cancellable, error))
goto out; goto out;
ret_deployment = ostree_deployment_new (-1, osname, treecsum, deployserial, ret_deployment = ostree_deployment_new (-1, osname, treecsum, deployserial,
bootcsum, treebootserial); bootcsum, treebootserial);
if (origin) if (origin)
ostree_deployment_set_origin (ret_deployment, origin); ostree_deployment_set_origin (ret_deployment, origin);