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

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
This commit is contained in:
Jonathan Lebon 2016-10-13 12:05:54 -04:00 committed by Atomic Bot
parent 3943284dad
commit a0598cb494
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2002,7 +2002,7 @@ allocate_deployserial (OstreeSysroot *self,
g_ptr_array_new_with_free_func (g_object_unref); g_ptr_array_new_with_free_func (g_object_unref);
osdir = ot_gfile_get_child_build_path (self->path, "ostree/deploy", osname, NULL); 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, if (!_ostree_sysroot_list_deployment_dirs_for_os (osdir, tmp_current_deployments,
cancellable, error)) cancellable, error))
goto out; goto out;
@ -2010,9 +2010,7 @@ allocate_deployserial (OstreeSysroot *self,
for (i = 0; i < tmp_current_deployments->len; i++) for (i = 0; i < tmp_current_deployments->len; i++)
{ {
OstreeDeployment *deployment = tmp_current_deployments->pdata[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) if (strcmp (ostree_deployment_get_csum (deployment), revision) != 0)
continue; continue;