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

src: drop some dead assignments 

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2015-03-05 11:57:41 +01:00
parent c2b01adbf0
commit 150048f9b8
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libostree/ostree-repo-static-delta-compilation.c
View File

@ -743,10 +743,7 @@ process_one_rollsum (OstreeRepo *repo,
} }
if (!reading_payload) if (!reading_payload)
{ g_string_append_c (current_part->operations, (gchar)OSTREE_STATIC_DELTA_OP_UNSET_READ_SOURCE);
g_string_append_c (current_part->operations, (gchar)OSTREE_STATIC_DELTA_OP_UNSET_READ_SOURCE);
reading_payload = TRUE;
}
{ guint64 remainder = tmp_to_len - writing_offset; { guint64 remainder = tmp_to_len - writing_offset;
if (remainder > 0) if (remainder > 0)

3
src/libostree/ostree-sysroot-deploy.c
View File

@ -1744,7 +1744,6 @@ ostree_sysroot_deploy_tree (OstreeSysroot *self,
gs_unref_object OstreeRepo *repo = NULL; gs_unref_object OstreeRepo *repo = NULL;
gs_unref_object GFile *osdeploydir = NULL; gs_unref_object GFile *osdeploydir = NULL;
gs_unref_object GFile *deployment_var = NULL; gs_unref_object GFile *deployment_var = NULL;
gs_unref_object GFile *deployment_etc = NULL;
gs_unref_object GFile *commit_root = NULL; gs_unref_object GFile *commit_root = NULL;
gs_unref_object GFile *tree_kernel_path = NULL; gs_unref_object GFile *tree_kernel_path = NULL;
gs_unref_object GFile *tree_initramfs_path = NULL; gs_unref_object GFile *tree_initramfs_path = NULL;
@ -1826,8 +1825,6 @@ ostree_sysroot_deploy_tree (OstreeSysroot *self,
g_clear_object (&self->sepolicy); g_clear_object (&self->sepolicy);
self->sepolicy = g_object_ref (sepolicy); self->sepolicy = g_object_ref (sepolicy);
deployment_etc = g_file_get_child (new_deployment_path, "etc");
if (!selinux_relabel_var_if_needed (self, sepolicy, deployment_var, if (!selinux_relabel_var_if_needed (self, sepolicy, deployment_var,
cancellable, error)) cancellable, error))
goto out; goto out;

5
src/libostree/ostree-sysroot-upgrader.c
View File

@ -115,8 +115,6 @@ ostree_sysroot_upgrader_initable_init (GInitable *initable,
OstreeSysrootUpgrader *self = (OstreeSysrootUpgrader*)initable; OstreeSysrootUpgrader *self = (OstreeSysrootUpgrader*)initable;
OstreeDeployment *booted_deployment = OstreeDeployment *booted_deployment =
ostree_sysroot_get_booted_deployment (self->sysroot); ostree_sysroot_get_booted_deployment (self->sysroot);
gs_unref_object GFile *deployment_path = NULL;
gs_unref_object GFile *deployment_origin_path = NULL;
if (booted_deployment == NULL && self->osname == NULL) if (booted_deployment == NULL && self->osname == NULL)
{ {
@ -145,9 +143,6 @@ ostree_sysroot_upgrader_initable_init (GInitable *initable,
goto out; goto out;
} }
deployment_path = ostree_sysroot_get_deployment_directory (self->sysroot, self->merge_deployment);
deployment_origin_path = ostree_sysroot_get_deployment_origin_path (deployment_path);
self->origin = ostree_deployment_get_origin (self->merge_deployment); self->origin = ostree_deployment_get_origin (self->merge_deployment);
if (!self->origin) if (!self->origin)
{ {