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 1RVE4Z-0006uB-Hb for garchives@archives.gentoo.org; Tue, 29 Nov 2011 03:09:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AE2B21C03F; Tue, 29 Nov 2011 03:09:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E279721C03F for ; Tue, 29 Nov 2011 03:09:18 +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 5E7461B400F for ; Tue, 29 Nov 2011 03:09:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9FC3C8003C for ; Tue, 29 Nov 2011 03:09:17 +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: <9a353d3759f70043023eb36491ece0b9a8cdba6b.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: 9a353d3759f70043023eb36491ece0b9a8cdba6b Date: Tue, 29 Nov 2011 03:09:17 +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: 3d9ffb24-c66d-455d-b4ad-619a4391e4b5 X-Archives-Hash: 82ce06aa3ad404aa18ef448c309f5d78 commit: 9a353d3759f70043023eb36491ece0b9a8cdba6b Author: Zac Medico gentoo org> AuthorDate: Tue Nov 29 03:09:10 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Nov 29 03:09:10 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D9a353d37 movefile: avoid redundant string concatenations --- pym/portage/util/movefile.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py index 70ecb60..c205fe9 100644 --- a/pym/portage/util/movefile.py +++ b/pym/portage/util/movefile.py @@ -169,15 +169,16 @@ def movefile(src, dest, newmtime=3DNone, sstat=3DNo= ne, mysettings=3DNone, if renamefailed: didcopy=3D0 if stat.S_ISREG(sstat[stat.ST_MODE]): + dest_tmp =3D dest + "#new" try: # For safety copy then move it over. if selinux_enabled: - selinux.copyfile(src, dest + "#new") - _copyxattr(src, dest + "#new") - selinux.rename(dest + "#new", dest) + selinux.copyfile(src, dest_tmp) + _copyxattr(src, dest_tmp) + selinux.rename(dest_tmp, dest) else: - shutil.copyfile(src, dest + "#new") - _copyxattr(src, dest + "#new") - os.rename(dest + "#new", dest) + shutil.copyfile(src, dest_tmp) + _copyxattr(src, dest_tmp) + os.rename(dest_tmp, dest) didcopy=3D1 except SystemExit as e: raise