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 1QLT8b-0004c1-PF for garchives@archives.gentoo.org; Sun, 15 May 2011 04:41:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48EDF1C017; Sun, 15 May 2011 04:40:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 13CA31C017 for ; Sun, 15 May 2011 04:40:58 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 81A971B4062 for ; Sun, 15 May 2011 04:40:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CE31280504 for ; Sun, 15 May 2011 04:40:56 +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: <5fc6f2b77d853eec51d6dbdfbfecc5dd7c5b5648.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: 5fc6f2b77d853eec51d6dbdfbfecc5dd7c5b5648 Date: Sun, 15 May 2011 04:40:56 +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: 1b9d2988bc36dde9598dfaf49a18b399 commit: 5fc6f2b77d853eec51d6dbdfbfecc5dd7c5b5648 Author: Zac Medico gentoo org> AuthorDate: Sun May 15 04:39:26 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 15 04:39:26 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5fc6f2b7 movefile: handle EEXIST when os.symlink fails --- pym/portage/util/movefile.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py index f8cc695..e07e8ca 100644 --- a/pym/portage/util/movefile.py +++ b/pym/portage/util/movefile.py @@ -90,7 +90,8 @@ def movefile(src, dest, newmtime=3DNone, sstat=3DNone, = mysettings=3DNone, # to tolerate these links being recreated during the merge # process. In any case, if the link is pointing at the right # place, we're in good shape. - if e.errno !=3D errno.ENOENT or target !=3D os.readlink(dest): + if e.errno not in (errno.ENOENT, errno.EEXIST) or \ + target !=3D os.readlink(dest): raise lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID]) # utime() only works on the target of a symlink, so it's not