[ostree] src: drop some dead assignments
- From: Giuseppe Scrivano <gscrivano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] src: drop some dead assignments
- Date: Fri, 6 Mar 2015 17:46:20 +0000 (UTC)
commit 150048f9b838f71b069fea9fbe3ac97ecabd9117
Author: Giuseppe Scrivano <gscrivan redhat com>
Date: Thu Mar 5 11:57:41 2015 +0100
src: drop some dead assignments
Signed-off-by: Giuseppe Scrivano <gscrivan redhat com>
.../ostree-repo-static-delta-compilation.c | 5 +----
src/libostree/ostree-sysroot-deploy.c | 3 ---
src/libostree/ostree-sysroot-upgrader.c | 5 -----
3 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/src/libostree/ostree-repo-static-delta-compilation.c
b/src/libostree/ostree-repo-static-delta-compilation.c
index ba1bd64..51e5d10 100644
--- a/src/libostree/ostree-repo-static-delta-compilation.c
+++ b/src/libostree/ostree-repo-static-delta-compilation.c
@@ -743,10 +743,7 @@ process_one_rollsum (OstreeRepo *repo,
}
if (!reading_payload)
- {
- g_string_append_c (current_part->operations, (gchar)OSTREE_STATIC_DELTA_OP_UNSET_READ_SOURCE);
- reading_payload = TRUE;
- }
+ g_string_append_c (current_part->operations, (gchar)OSTREE_STATIC_DELTA_OP_UNSET_READ_SOURCE);
{ guint64 remainder = tmp_to_len - writing_offset;
if (remainder > 0)
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index f5ce6e9..4d59a03 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -1744,7 +1744,6 @@ ostree_sysroot_deploy_tree (OstreeSysroot *self,
gs_unref_object OstreeRepo *repo = NULL;
gs_unref_object GFile *osdeploydir = 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 *tree_kernel_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);
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,
cancellable, error))
goto out;
diff --git a/src/libostree/ostree-sysroot-upgrader.c b/src/libostree/ostree-sysroot-upgrader.c
index 81f5ff2..997ea6b 100644
--- a/src/libostree/ostree-sysroot-upgrader.c
+++ b/src/libostree/ostree-sysroot-upgrader.c
@@ -115,8 +115,6 @@ ostree_sysroot_upgrader_initable_init (GInitable *initable,
OstreeSysrootUpgrader *self = (OstreeSysrootUpgrader*)initable;
OstreeDeployment *booted_deployment =
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)
{
@@ -145,9 +143,6 @@ ostree_sysroot_upgrader_initable_init (GInitable *initable,
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);
if (!self->origin)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]