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 966E81381F3 for ; Mon, 12 Aug 2013 08:28:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DCCDE0ADF; Mon, 12 Aug 2013 08:28:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA257E0ADF for ; Mon, 12 Aug 2013 08:28:47 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3253333EC48 for ; Mon, 12 Aug 2013 08:28:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 81E98E468F for ; Mon, 12 Aug 2013 08:28:44 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1376296105.5895b5e0763ebf9b52dedf2a5760bc4791ad1c1d.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/defaultscript.py X-VCS-Directories: roverlay/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 5895b5e0763ebf9b52dedf2a5760bc4791ad1c1d X-VCS-Branch: master Date: Mon, 12 Aug 2013 08:28:44 +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: 51c00b76-2a60-4a45-a710-ea21a5e848e1 X-Archives-Hash: e068ec54c07d397c5376e1e506bf4b69 commit: 5895b5e0763ebf9b52dedf2a5760bc4791ad1c1d Author: André Erdmann mailerd de> AuthorDate: Mon Aug 12 08:25:49 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Mon Aug 12 08:28:25 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=5895b5e0 setupdirs command: don't modify symlinks --- roverlay/defaultscript.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/roverlay/defaultscript.py b/roverlay/defaultscript.py index 0aa32d8..dfbe29d 100644 --- a/roverlay/defaultscript.py +++ b/roverlay/defaultscript.py @@ -170,12 +170,18 @@ def run_setupdirs ( env ): ) if dirpath: - dodir ( dirpath ) - if dirmask & WANT_PRIVATE: - os.chmod ( dirpath, dirmode_private ) - if dirmask & WANT_USERDIR and should_chown: - os.chown ( dirpath, target_uid, target_gid ) - + if os.path.islink ( dirpath ): + sys.stdout.write ( + '{!r} is a symlink - skipping setupdir ' + 'actions.\n'.format ( dirpath ) + ) + else: + #elif dodir ( dirpath ): + dodir ( dirpath ) + if dirmask & WANT_PRIVATE: + os.chmod ( dirpath, dirmode_private ) + if dirmask & WANT_USERDIR and should_chown: + os.chown ( dirpath, target_uid, target_gid ) return os.EX_OK # --- end of run_setupdirs (...) ---