Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/
Date: Sat, 24 Oct 2015 06:58:32
Message-Id: 1444590322.d4efb6bffa322304e6ebba7797f7b9c2e6460465.vapier@gentoo
1 commit: d4efb6bffa322304e6ebba7797f7b9c2e6460465
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 11 19:05:22 2015 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 11 19:05:22 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d4efb6bf
7
8 lock: fix ensure_dirs call
9
10 We want to use our local wrapper because the snakeoil one defaults
11 to mode 777 whereas ours defaults to 755.
12
13 catalyst/lock.py | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
15
16 diff --git a/catalyst/lock.py b/catalyst/lock.py
17 index 39926dd..808df4e 100644
18 --- a/catalyst/lock.py
19 +++ b/catalyst/lock.py
20 @@ -3,6 +3,7 @@ import os
21
22 from snakeoil import fileutils
23 from snakeoil import osutils
24 +from catalyst.fileops import ensure_dirs
25
26
27 LockInUse = osutils.LockException
28 @@ -14,7 +15,7 @@ class LockDir(object):
29 def __init__(self, lockdir):
30 self.gid = 250
31 self.lockfile = os.path.join(lockdir, '.catalyst_lock')
32 - osutils.ensure_dirs(lockdir)
33 + ensure_dirs(lockdir)
34 fileutils.touch(self.lockfile, mode=0o664)
35 os.chown(self.lockfile, -1, self.gid)
36 self.lock = osutils.FsLock(self.lockfile)