ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-01 23:30:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add make_dirs_with_absolute_mode to fileutils

Browse Source
This commit is contained in:
David Stainton 2016-01-21 19:34:24 +01:00 committed by Brian Warner
parent 50747e2ca0
commit 3524729fb1
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/allmydata/test/test_util.py
View File

@ -567,6 +567,21 @@ class FileUtil(ReallyEqualMixin, unittest.TestCase):
finally: finally:
os.chdir(saved_cwd) os.chdir(saved_cwd)
def test_make_dirs_with_absolute_mode(self):
workdir = u"test_make_dirs_with_absolute_mode"
fileutil.make_dirs(workdir)
fileutil.make_dirs_with_absolute_mode(workdir, os.path.join(workdir,"a/b/c/d"), 0766)
new_mode = os.stat(os.path.join(workdir,"a/b/c/d")).st_mode & 0777
self.failUnlessEqual(new_mode, 0766)
new_mode = os.stat(os.path.join(workdir,"a/b/c")).st_mode & 0777
self.failUnlessEqual(new_mode, 0766)
new_mode = os.stat(os.path.join(workdir,"a/b")).st_mode & 0777
self.failUnlessEqual(new_mode, 0766)
new_mode = os.stat(os.path.join(workdir,"a")).st_mode & 0777
self.failUnlessEqual(new_mode, 0766)
new_mode = os.stat(workdir).st_mode & 0777
self.failIfEqual(new_mode, 0766)
def test_create_long_path(self): def test_create_long_path(self):
workdir = u"test_create_long_path" workdir = u"test_create_long_path"
fileutil.make_dirs(workdir) fileutil.make_dirs(workdir)

25
src/allmydata/util/fileutil.py
View File

@ -142,6 +142,31 @@ class EncryptedTemporaryFile:
old end-of-file are unspecified. The file position after this operation is unspecified.""" old end-of-file are unspecified. The file position after this operation is unspecified."""
self.file.truncate(newsize) self.file.truncate(newsize)
def make_dirs_with_absolute_mode(parent, dirname, mode):
"""
Make directory `dirname` and chmod it to `mode` afterwards.
We chmod all parent directories of `dirname` until we reach
`parent`.
"""
precondition_abspath(parent)
precondition_abspath(dirname)
if not is_ancestor_path(parent, dirname):
raise AssertionError("dirname must be a descendant of parent")
make_dirs(dirname)
while dirname != parent:
os.chmod(dirname, mode)
# FIXME: doesn't seem to work on Windows for long paths
old_dirname, dirname = dirname, os.path.dirname(dirname)
_assert(len(dirname) < len(old_dirname), dirname=dirname, old_dirname=old_dirname)
def is_ancestor_path(parent, dirname):
while dirname != parent:
# FIXME: doesn't seem to work on Windows for long paths
old_dirname, dirname = dirname, os.path.dirname(dirname)
if len(dirname) >= len(old_dirname):
return False
return True
def make_dirs(dirname, mode=0777): def make_dirs(dirname, mode=0777):
""" """