From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3526713888F for ; Sat, 24 Oct 2015 06:58:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D364AE080D; Sat, 24 Oct 2015 06:58:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B17DFE080C for ; Sat, 24 Oct 2015 06:58:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1A8B340B54 for ; Sat, 24 Oct 2015 06:58:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB7FC173F for ; Sat, 24 Oct 2015 06:58:20 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1444590322.d4efb6bffa322304e6ebba7797f7b9c2e6460465.vapier@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/lock.py X-VCS-Directories: catalyst/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: d4efb6bffa322304e6ebba7797f7b9c2e6460465 X-VCS-Branch: master Date: Sat, 24 Oct 2015 06:58:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d95a7a3f-7275-4415-bde2-2996d0d242b0 X-Archives-Hash: b2255a083064508b688ebea623542cdb commit: d4efb6bffa322304e6ebba7797f7b9c2e6460465 Author: Mike Frysinger gentoo org> AuthorDate: Sun Oct 11 19:05:22 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sun Oct 11 19:05:22 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d4efb6bf lock: fix ensure_dirs call We want to use our local wrapper because the snakeoil one defaults to mode 777 whereas ours defaults to 755. catalyst/lock.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catalyst/lock.py b/catalyst/lock.py index 39926dd..808df4e 100644 --- a/catalyst/lock.py +++ b/catalyst/lock.py @@ -3,6 +3,7 @@ import os from snakeoil import fileutils from snakeoil import osutils +from catalyst.fileops import ensure_dirs LockInUse = osutils.LockException @@ -14,7 +15,7 @@ class LockDir(object): def __init__(self, lockdir): self.gid = 250 self.lockfile = os.path.join(lockdir, '.catalyst_lock') - osutils.ensure_dirs(lockdir) + ensure_dirs(lockdir) fileutils.touch(self.lockfile, mode=0o664) os.chown(self.lockfile, -1, self.gid) self.lock = osutils.FsLock(self.lockfile)