keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

importer: Filter out /var/lib/rpm from rpm

Browse Source 
Otherwise we can get a repeat of #290 in the unprivileged container
assembly path.

Closes: #1787
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2019-03-18 13:15:48 -04:00 committed by Atomic Bot
parent 6cdcd474b6
commit 86c811af8d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libpriv/rpmostree-importer.c
View File

@ -727,6 +727,12 @@ unprivileged_filter_cb (OstreeRepo *repo,
g_file_info_set_attribute_uint32 (file_info, "unix::mode", mode);
}
/* HACK: Also special-case rpm's `/var/lib/rpm` here like in the privileged flow;
* otherwise libsolv can get confused (see
* https://github.com/projectatomic/rpm-ostree/pull/290) */
if (g_str_has_prefix (path, "/var/lib/rpm"))
return OSTREE_REPO_COMMIT_FILTER_SKIP;
return OSTREE_REPO_COMMIT_FILTER_ALLOW;
}