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 1SB96i-0006A3-3y for garchives@archives.gentoo.org; Fri, 23 Mar 2012 18:21:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E5A2E0B71; Fri, 23 Mar 2012 18:20:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 40C97E0B71 for ; Fri, 23 Mar 2012 18:20:52 +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 780EB1B4007 for ; Fri, 23 Mar 2012 18:20:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3AF27E5403 for ; Fri, 23 Mar 2012 18:20:50 +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: <1332526814.6d2be766e6056e266522c9e39d663d7c0ac42e0d.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: 6d2be766e6056e266522c9e39d663d7c0ac42e0d X-VCS-Branch: master Date: Fri, 23 Mar 2012 18:20:50 +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: ba67694f-3cae-4a79-bbd0-086215f1c87f X-Archives-Hash: e43f72a1b1b9a6941df88abbbbfc5223 commit: 6d2be766e6056e266522c9e39d663d7c0ac42e0d Author: Zac Medico gentoo org> AuthorDate: Fri Mar 23 18:05:36 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Mar 23 18:20:14 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D6d2be766 movefile: refactor selinux conditional code --- pym/portage/util/movefile.py | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py index 476f8e7..252f4a2 100644 --- a/pym/portage/util/movefile.py +++ b/pym/portage/util/movefile.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Gentoo Foundation +# Copyright 2010-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 __all__ =3D ['movefile'] @@ -85,15 +85,20 @@ def movefile(src, dest, newmtime=3DNone, sstat=3DNone= , mysettings=3DNone, mysettings =3D portage.settings =20 src_bytes =3D _unicode_encode(src, encoding=3Dencoding, errors=3D'stric= t') + dest_bytes =3D _unicode_encode(dest, encoding=3Dencoding, errors=3D'str= ict') xattr_enabled =3D "xattr" in mysettings.features selinux_enabled =3D mysettings.selinux_enabled() if selinux_enabled: selinux =3D _unicode_module_wrapper(_selinux, encoding=3Dencoding) + _copyfile =3D selinux.copyfile + _rename =3D selinux.rename + else: + _copyfile =3D _shutil.copyfile + _rename =3D _os.rename =20 lchown =3D _unicode_func_wrapper(portage.data.lchown, encoding=3Dencodi= ng) os =3D _unicode_module_wrapper(_os, encoding=3Dencoding, overrides=3D_os_overrides) - shutil =3D _unicode_module_wrapper(_shutil, encoding=3Dencoding) =20 try: if not sstat: @@ -222,19 +227,12 @@ def movefile(src, dest, newmtime=3DNone, sstat=3DNo= ne, mysettings=3DNone, dest_tmp_bytes =3D _unicode_encode(dest_tmp, encoding=3Dencoding, errors=3D'strict') try: # For safety copy then move it over. - if selinux_enabled: - selinux.copyfile(src, dest_tmp) - if xattr_enabled: - _copyxattr(src_bytes, dest_tmp_bytes) - _apply_stat(sstat, dest_tmp_bytes) - selinux.rename(dest_tmp, dest) - else: - shutil.copyfile(src, dest_tmp) - if xattr_enabled: - _copyxattr(src_bytes, dest_tmp_bytes) - _apply_stat(sstat, dest_tmp_bytes) - os.rename(dest_tmp, dest) - os.unlink(src) + _copyfile(src_bytes, dest_tmp_bytes) + if xattr_enabled: + _copyxattr(src_bytes, dest_tmp_bytes) + _apply_stat(sstat, dest_tmp_bytes) + _rename(dest_tmp_bytes, dest_bytes) + _os.unlink(src_bytes) except SystemExit as e: raise except Exception as e: