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

Fix ostree_repo_list_static_delta_names 

The current layout uses a prefix of two bytes as the initial dir
and a second directory inside that with the superblock. This
updates the list code to handle that.

https://bugzilla.gnome.org/show_bug.cgi?id=721799
This commit is contained in:
Alexander Larsson 2015-01-13 21:28:17 +01:00
parent 97fbd872ae
commit 82ed6c43ed
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/libostree/ostree-repo-static-delta-core.c
View File

@ -80,12 +80,12 @@ ostree_repo_list_static_delta_names (OstreeRepo *self,
NULL, error); NULL, error);
if (!dir_enum) if (!dir_enum)
goto out; goto out;
while (TRUE) while (TRUE)
{ {
gs_unref_object GFileEnumerator *dir_enum2 = NULL;
GFileInfo *file_info; GFileInfo *file_info;
GFile *child; GFile *child;
const char *name;
if (!gs_file_enumerator_iterate (dir_enum, &file_info, &child, if (!gs_file_enumerator_iterate (dir_enum, &file_info, &child,
NULL, error)) NULL, error))
@ -96,16 +96,41 @@ ostree_repo_list_static_delta_names (OstreeRepo *self,
if (g_file_info_get_file_type (file_info) != G_FILE_TYPE_DIRECTORY) if (g_file_info_get_file_type (file_info) != G_FILE_TYPE_DIRECTORY)
continue; continue;
name = gs_file_get_basename_cached (child);
{ dir_enum2 = g_file_enumerate_children (child, OSTREE_GIO_FAST_QUERYINFO,
gs_unref_object GFile *meta_path = g_file_get_child (child, "superblock"); G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
NULL, error);
if (!dir_enum2)
goto out;
while (TRUE)
{
GFileInfo *file_info2;
GFile *child2;
const char *name1;
const char *name2;
if (!gs_file_enumerator_iterate (dir_enum2, &file_info2, &child2,
NULL, error))
goto out;
if (file_info2 == NULL)
break;
if (g_file_info_get_file_type (file_info2) != G_FILE_TYPE_DIRECTORY)
continue;
name1 = gs_file_get_basename_cached (child);
name2 = gs_file_get_basename_cached (child2);
if (g_file_query_exists (meta_path, NULL))
{ {
g_ptr_array_add (ret_deltas, g_strdup (name)); gs_unref_object GFile *meta_path = g_file_get_child (child2, "superblock");
if (g_file_query_exists (meta_path, NULL))
{
g_ptr_array_add (ret_deltas, g_strconcat (name1, name2, NULL));
}
} }
} }
} }
} }