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 1RVDvr-00047A-U0 for garchives@archives.gentoo.org; Tue, 29 Nov 2011 03:00:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A574821C021; Tue, 29 Nov 2011 03:00:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7117E21C021 for ; Tue, 29 Nov 2011 03:00:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C86051B4019 for ; Tue, 29 Nov 2011 03:00:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2A41180044 for ; Tue, 29 Nov 2011 03:00:22 +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: <3c1111c248b11972f5d2316e6d8455b7fa11ccc4.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/util/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/util/movefile.py X-VCS-Directories: pym/portage/util/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 3c1111c248b11972f5d2316e6d8455b7fa11ccc4 Date: Tue, 29 Nov 2011 03:00:22 +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: 785ff9e2-a396-4d06-aa4b-39ba4e1ada55 X-Archives-Hash: 87af2be19eb54cd49130a9e97ce955a9 commit: 3c1111c248b11972f5d2316e6d8455b7fa11ccc4 Author: Zac Medico gentoo org> AuthorDate: Tue Nov 29 03:00:15 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Nov 29 03:00:15 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D3c1111c2 movefile: remove unused lchown --- pym/portage/util/movefile.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py index 995f6e7..70ecb60 100644 --- a/pym/portage/util/movefile.py +++ b/pym/portage/util/movefile.py @@ -197,10 +197,8 @@ def movefile(src, dest, newmtime=3DNone, sstat=3DNon= e, mysettings=3DNone, return None # failure try: if didcopy: - if stat.S_ISLNK(sstat[stat.ST_MODE]): - lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID]) - else: - os.chown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID]) + # didcopy is True only if S_ISREG returned True + os.chown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID]) os.chmod(dest, stat.S_IMODE(sstat[stat.ST_MODE])) # Sticky is reset = on chown os.unlink(src) except SystemExit as e: