diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-07-30 11:13:26 -0700 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-07-30 11:13:26 -0700 |
| commit | a5f53757aad35827004762e1e3063310cd7f5fda (patch) | |
| tree | 28a675c5a1c72f8f3febf27cae02ed2c6c839809 | |
| parent | 8ad614f3d2c19037e9aaa8895119adad7d699060 (diff) | |
| parent | 9482a5637a4fe67f42783ebcad7c89ef413717a0 (diff) | |
| download | bcfg2-a5f53757aad35827004762e1e3063310cd7f5fda.tar.gz bcfg2-a5f53757aad35827004762e1e3063310cd7f5fda.tar.bz2 bcfg2-a5f53757aad35827004762e1e3063310cd7f5fda.zip | |
Merge pull request #126 from fennm/posix-ignore-perms-failures-for-autocreated-dirs
POSIX: Ignore permissions error on auto-created dirs
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/base.py | 9 | ||||
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py index 3778569a6..fb5d06e54 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py @@ -686,7 +686,7 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): """ os.makedirs helpfully creates all parent directories for us, but it sets permissions according to umask, which is probably wrong. we need to find out which directories were - created and set permissions on those + created and try to set permissions on those (http://trac.mcs.anl.gov/projects/bcfg2/ticket/1125 and http://trac.mcs.anl.gov/projects/bcfg2/ticket/1134) """ created = [] @@ -706,8 +706,9 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): (path, err)) rv = False - # set auto-created directories to mode 755, if you need - # something else, you should specify it in your config + # set auto-created directories to mode 755 and use best effort for + # permissions. If you need something else, you should specify it in + # your config. tmpentry = copy.deepcopy(entry) tmpentry.set('mode', '0755') for acl in tmpentry.findall('ACL'): @@ -715,7 +716,7 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): oct_mode(self._norm_acl_perms(acl.get('perms')) | ACL_MAP['x'])) for cpath in created: - rv &= self._set_perms(tmpentry, path=cpath) + self._set_perms(tmpentry, path=cpath) return rv diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py index e0406fd92..8e7b58d30 100644 --- a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py +++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py @@ -1009,7 +1009,7 @@ class TestPOSIXTool(TestTool): else: return True ptool._set_perms.side_effect = set_perms_rv - self.assertFalse(ptool._makedirs(entry)) + self.assertTrue(ptool._makedirs(entry)) self.assertItemsEqual(mock_exists.call_args_list, [call("/test"), call("/test/foo"), call("/test/foo/bar")]) |