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 0B5CC138A1A for ; Sun, 11 Jan 2015 08:50:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60B6CE0784; Sun, 11 Jan 2015 08:50:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DBE31E0782 for ; Sun, 11 Jan 2015 08:50:25 +0000 (UTC) Received: from localhost.localdomain (99.sub-70-209-195.myvzw.com [70.209.195.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: zmedico) by smtp.gentoo.org (Postfix) with ESMTPSA id 2EF7C3406B5; Sun, 11 Jan 2015 08:50:23 +0000 (UTC) From: Zac Medico To: gentoo-portage-dev@lists.gentoo.org Cc: Zac Medico Subject: [gentoo-portage-dev] [PATCH] dispatch-conf: avoid symlink "File exists" error (535850) Date: Sun, 11 Jan 2015 00:49:50 -0800 Message-Id: <1420966190-7007-1-git-send-email-zmedico@gentoo.org> X-Mailer: git-send-email 2.0.5 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: 5bffe6af-dc62-45e0-9ecd-0f94a51818f9 X-Archives-Hash: 33e292402175c587dfe9238a0363b090 Since commit f17448317166bfac42dc279b8795cd581c189582, an existing symlink in /etc/config-archive could trigger a fatal "File exists" error. Handle this by removing the destination file if it exists. This was not necessary when dispatch-conf only supported regular files, since shutil.copy2 would simply overwrite the regular destination file. Fixes: f17448317166 ("dispatch-conf: symlink support for bug #485598") X-Gentoo-Bug: 535850 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=535850 --- pym/portage/dispatch_conf.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py index b27e68b..7d55182 100644 --- a/pym/portage/dispatch_conf.py +++ b/pym/portage/dispatch_conf.py @@ -179,6 +179,12 @@ def rcs_archive(archive, curconf, newconf, mrgconf): if curconf_st is not None and \ (stat.S_ISREG(curconf_st.st_mode) or stat.S_ISLNK(curconf_st.st_mode)): + # Remove destination file in order to ensure that the following + # symlink or copy2 call won't fail (see bug #535850). + try: + os.unlink(archive) + except OSError: + pass try: if stat.S_ISLNK(curconf_st.st_mode): os.symlink(os.readlink(curconf), archive) @@ -208,6 +214,12 @@ def rcs_archive(archive, curconf, newconf, mrgconf): if has_branch: os.rename(archive, archive + '.dist') + # Remove destination file in order to ensure that the following + # symlink or copy2 call won't fail (see bug #535850). + try: + os.unlink(archive) + except OSError: + pass try: if stat.S_ISLNK(mystat.st_mode): os.symlink(os.readlink(newconf), archive) @@ -264,6 +276,12 @@ def file_archive(archive, curconf, newconf, mrgconf): if curconf_st is not None and \ (stat.S_ISREG(curconf_st.st_mode) or stat.S_ISLNK(curconf_st.st_mode)): + # Remove destination file in order to ensure that the following + # symlink or copy2 call won't fail (see bug #535850). + try: + os.unlink(archive) + except OSError: + pass try: if stat.S_ISLNK(curconf_st.st_mode): os.symlink(os.readlink(curconf), archive) @@ -285,6 +303,12 @@ def file_archive(archive, curconf, newconf, mrgconf): stat.S_ISLNK(mystat.st_mode)): # Save off new config file in the archive dir with .dist.new suffix newconf_archive = archive + '.dist.new' + # Remove destination file in order to ensure that the following + # symlink or copy2 call won't fail (see bug #535850). + try: + os.unlink(newconf_archive) + except OSError: + pass try: if stat.S_ISLNK(mystat.st_mode): os.symlink(os.readlink(newconf), newconf_archive) -- 2.0.5