From a0598cb494cb3b266c28696470eab7be6d29b3ed Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 13 Oct 2016 12:05:54 -0400 Subject: [PATCH] ostree-sysroot-deploy.c: delete redundant check Just noticed this while inspecting the code. The deployments retrieved by `_ostree_sysroot_list_deployment_dirs_for_os` will forcibly already have a matching osname since it indirectly uses that same variable to construct them. Having a check there makes it look like there may be subtle corner cases, when there aren't. Closes: #529 Approved by: cgwalters --- src/libostree/ostree-sysroot-deploy.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c index 65173ffe..a14f6005 100644 --- a/src/libostree/ostree-sysroot-deploy.c +++ b/src/libostree/ostree-sysroot-deploy.c @@ -2002,7 +2002,7 @@ allocate_deployserial (OstreeSysroot *self, g_ptr_array_new_with_free_func (g_object_unref); osdir = ot_gfile_get_child_build_path (self->path, "ostree/deploy", osname, NULL); - + if (!_ostree_sysroot_list_deployment_dirs_for_os (osdir, tmp_current_deployments, cancellable, error)) goto out; @@ -2010,9 +2010,7 @@ allocate_deployserial (OstreeSysroot *self, for (i = 0; i < tmp_current_deployments->len; i++) { OstreeDeployment *deployment = tmp_current_deployments->pdata[i]; - - if (strcmp (ostree_deployment_get_osname (deployment), osname) != 0) - continue; + if (strcmp (ostree_deployment_get_csum (deployment), revision) != 0) continue;