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

pull: Only fetch .archive-content for regular files 

Otherwise e.g. Apache httpd might try to follow a symbolic link to
/bin/tinylogin which clearly won't work.
This commit is contained in:
Colin Walters 2012-02-23 12:30:01 -05:00
parent 0276be768d
commit dee30bda7c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ostree/ostree-pull.c
View File

@ -256,14 +256,6 @@ store_tree_recurse (OstreeRepo *repo,
error)) error))
goto out; goto out;
g_clear_object (&content_file);
if (!fetch_object (repo, soup, base_uri, checksum,
OSTREE_OBJECT_TYPE_ARCHIVED_FILE_CONTENT,
&did_exist,
&content_file,
error))
goto out;
if (!ostree_map_metadata_file (meta_file, OSTREE_OBJECT_TYPE_ARCHIVED_FILE_META, if (!ostree_map_metadata_file (meta_file, OSTREE_OBJECT_TYPE_ARCHIVED_FILE_META,
&archive_metadata, error)) &archive_metadata, error))
goto out; goto out;
@ -271,8 +263,17 @@ store_tree_recurse (OstreeRepo *repo,
if (!ostree_parse_archived_file_meta (archive_metadata, &archive_file_info, &archive_xattrs, error)) if (!ostree_parse_archived_file_meta (archive_metadata, &archive_file_info, &archive_xattrs, error))
goto out; goto out;
g_clear_object (&input);
g_clear_object (&content_file);
if (g_file_info_get_file_type (archive_file_info) == G_FILE_TYPE_REGULAR) if (g_file_info_get_file_type (archive_file_info) == G_FILE_TYPE_REGULAR)
{ {
if (!fetch_object (repo, soup, base_uri, checksum,
OSTREE_OBJECT_TYPE_ARCHIVED_FILE_CONTENT,
&did_exist,
&content_file,
error))
goto out;
input = (GInputStream*)g_file_read (content_file, NULL, error); input = (GInputStream*)g_file_read (content_file, NULL, error);
if (!input) if (!input)
goto out; goto out;