From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QgNgY-0002Kb-VK for garchives@archives.gentoo.org; Mon, 11 Jul 2011 21:06:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F6D221C050; Mon, 11 Jul 2011 21:06:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 518E321C050 for ; Mon, 11 Jul 2011 21:06:25 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C35811BC0D1 for ; Mon, 11 Jul 2011 21:06:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1135F8003D for ; Mon, 11 Jul 2011 21:06:24 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/, pym/portage/elog/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/elog/mod_save.py pym/portage/elog/mod_save_summary.py pym/portage/package/ebuild/prepare_build_dirs.py X-VCS-Directories: pym/portage/package/ebuild/ pym/portage/elog/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: baecf07ec888f338b8f628d2c0358d3d70d24f8f Date: Mon, 11 Jul 2011 21:06:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 7afea296a0d1f20abf7f2c0669a3809c commit: baecf07ec888f338b8f628d2c0358d3d70d24f8f Author: Zac Medico gentoo org> AuthorDate: Mon Jul 11 21:02:40 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jul 11 21:02:40 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dbaecf07e elog/mod_save: fix permissions for logrotate These permissions should be compatible with our default logrotate config as discussed in bug 374287. --- pym/portage/elog/mod_save.py | 6 ++++-- pym/portage/elog/mod_save_summary.py | 6 ++++-- pym/portage/package/ebuild/prepare_build_dirs.py | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pym/portage/elog/mod_save.py b/pym/portage/elog/mod_save.py index 36654b3..9350a6e 100644 --- a/pym/portage/elog/mod_save.py +++ b/pym/portage/elog/mod_save.py @@ -8,7 +8,7 @@ from portage import os from portage import _encodings from portage import _unicode_decode from portage import _unicode_encode -from portage.data import portage_gid +from portage.data import portage_gid, portage_uid from portage.package.ebuild.prepare_build_dirs import _ensure_log_subdir= s from portage.util import ensure_dirs, normalize_path =20 @@ -23,7 +23,9 @@ def process(mysettings, key, logentries, fulltext): # Only initialize group/mode if the directory doesn't # exist, so that we don't override permissions if they # were previously set by the administrator. - ensure_dirs(logdir, gid=3Dportage_gid, mode=3D0o2770) + # NOTE: These permissions should be compatible with our + # default logrotate config as discussed in bug 374287. + ensure_dirs(logdir, uid=3Dportage_uid, gid=3Dportage_gid, mode=3D0o277= 0) =20 cat =3D mysettings['CATEGORY'] pf =3D mysettings['PF'] diff --git a/pym/portage/elog/mod_save_summary.py b/pym/portage/elog/mod_= save_summary.py index f090dea..4adc6f3 100644 --- a/pym/portage/elog/mod_save_summary.py +++ b/pym/portage/elog/mod_save_summary.py @@ -8,7 +8,7 @@ from portage import os from portage import _encodings from portage import _unicode_decode from portage import _unicode_encode -from portage.data import portage_gid +from portage.data import portage_gid, portage_uid from portage.localization import _ from portage.package.ebuild.prepare_build_dirs import _ensure_log_subdir= s from portage.util import apply_permissions, ensure_dirs, normalize_path @@ -23,7 +23,9 @@ def process(mysettings, key, logentries, fulltext): # Only initialize group/mode if the directory doesn't # exist, so that we don't override permissions if they # were previously set by the administrator. - ensure_dirs(logdir, gid=3Dportage_gid, mode=3D0o2770) + # NOTE: These permissions should be compatible with our + # default logrotate config as discussed in bug 374287. + ensure_dirs(logdir, uid=3Dportage_uid, gid=3Dportage_gid, mode=3D0o277= 0) =20 elogdir =3D os.path.join(logdir, "elog") _ensure_log_subdirs(logdir, elogdir) diff --git a/pym/portage/package/ebuild/prepare_build_dirs.py b/pym/porta= ge/package/ebuild/prepare_build_dirs.py index aaf0740..616dc2e 100644 --- a/pym/portage/package/ebuild/prepare_build_dirs.py +++ b/pym/portage/package/ebuild/prepare_build_dirs.py @@ -286,6 +286,11 @@ def _prepare_workdir(mysettings): try: modified =3D ensure_dirs(mysettings["PORT_LOGDIR"]) if modified: + # Only initialize group/mode if the directory doesn't + # exist, so that we don't override permissions if they + # were previously set by the administrator. + # NOTE: These permissions should be compatible with our + # default logrotate config as discussed in bug 374287. apply_secpass_permissions(mysettings["PORT_LOGDIR"], uid=3Dportage_uid, gid=3Dportage_gid, mode=3D0o2770) except PortageException as e: