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

Merge pull request #2548 from cgwalters/mtree-load-ensured

This commit is contained in:
Jonathan Lebon 2022-02-22 15:20:22 -05:00 committed by GitHub
parent 4a38ac7b8d f36a940ed0
commit 00e39ebedc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libostree/ostree-mutable-tree.c
View File

@ -463,13 +463,11 @@ ostree_mutable_tree_ensure_parent_dirs (OstreeMutableTree *self,
OstreeMutableTree *subdir = self; /* nofree */ OstreeMutableTree *subdir = self; /* nofree */
for (guint i = 0; i+1 < split_path->len; i++) for (guint i = 0; i+1 < split_path->len; i++)
{ {
OstreeMutableTree *next;
const char *name = split_path->pdata[i]; const char *name = split_path->pdata[i];
if (g_hash_table_lookup (subdir->files, name)) if (g_hash_table_lookup (subdir->files, name))
return glnx_throw (error, "Can't replace file with directory: %s", name); return glnx_throw (error, "Can't replace file with directory: %s", name);
next = g_hash_table_lookup (subdir->subdirs, name); OstreeMutableTree *next = g_hash_table_lookup (subdir->subdirs, name);
if (!next) if (!next)
{ {
invalidate_contents_checksum (subdir); invalidate_contents_checksum (subdir);
@ -479,6 +477,9 @@ ostree_mutable_tree_ensure_parent_dirs (OstreeMutableTree *self,
} }
subdir = next; subdir = next;
g_assert (subdir);
if (!_ostree_mutable_tree_make_whole (subdir, NULL, error))
return FALSE;
} }
if (out_parent) if (out_parent)
@ -580,11 +581,9 @@ ostree_mutable_tree_walk (OstreeMutableTree *self,
} }
else else
{ {
OstreeMutableTree *subdir;
if (!_ostree_mutable_tree_make_whole (self, NULL, error)) if (!_ostree_mutable_tree_make_whole (self, NULL, error))
return FALSE; return FALSE;
OstreeMutableTree *subdir = g_hash_table_lookup (self->subdirs, split_path->pdata[start]);
subdir = g_hash_table_lookup (self->subdirs, split_path->pdata[start]);
if (!subdir) if (!subdir)
return set_error_noent (error, (char*)split_path->pdata[start]); return set_error_noent (error, (char*)split_path->pdata[start]);