summaryrefslogtreecommitdiff
path: root/buildstream/_ostree.py
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-06-11 21:24:08 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-06-12 15:19:15 +0900
commiteec8557522d32d1afc9ef59f872d811fcc133289 (patch)
treec0a1555de600f83d542772c8b2061f3a5ba9357d /buildstream/_ostree.py
parentba2516219fa0a59cc4fa30c37a4d5f8e0f8367e3 (diff)
downloadbuildstream-eec8557522d32d1afc9ef59f872d811fcc133289.tar.gz
_ostree.py: Restore the setting of everything to root ownership
This should eventually change with a fuse layer that cooperates with ostree and fakes root permissions.
Diffstat (limited to 'buildstream/_ostree.py')
-rw-r--r--buildstream/_ostree.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/buildstream/_ostree.py b/buildstream/_ostree.py
index 7952cb5fc..994f143d5 100644
--- a/buildstream/_ostree.py
+++ b/buildstream/_ostree.py
@@ -116,15 +116,14 @@ def commit(repo, dir, ref):
def commit_filter(repo, path, file_info):
- # If we wanted to commit as uid/gid root, then
- # we would set the following in this filter:
+ # For now, just set everything in the repo as uid/gid 0
#
- # file_info.set_attribute_uint32('unix::uid', 0)
- # file_info.set_attribute_uint32('unix::gid', 0)
+ # In the future we'll want to extract virtualized file
+ # attributes from a fuse layer and use that.
#
- # We don't do this because ostree user mode checkouts
- # not only munge the ownership bits but _also_ the permission
- # bits.
+ file_info.set_attribute_uint32('unix::uid', 0)
+ file_info.set_attribute_uint32('unix::gid', 0)
+
return OSTree.RepoCommitFilterResult.ALLOW
commit_modifier = OSTree.RepoCommitModifier.new(