From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 21 Oct 2010 15:28:24 +0000 (-0700)
Subject: dispatch-conf: suppress 'No such file' errors.
X-Git-Tag: v2.1.9.21~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=71234e0a63ddf73dfd2a1d66da28a64969932cc0;p=portage.git

dispatch-conf: suppress 'No such file' errors.

This will fix bug #341463.
---

diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py
index e51e5cd13..5724d9169 100644
--- a/pym/portage/dispatch_conf.py
+++ b/pym/portage/dispatch_conf.py
@@ -83,11 +83,13 @@ def rcs_archive(archive, curconf, newconf, mrgconf):
     except OSError:
         pass
 
-    try:
-        shutil.copy2(curconf, archive)
-    except(IOError, os.error) as why:
-        print(_('dispatch-conf: Error copying %(curconf)s to %(archive)s: %(reason)s; fatal') % \
-              {"curconf": curconf, "archive": archive, "reason": str(why)}, file=sys.stderr)
+    if os.path.isfile(curconf):
+        try:
+            shutil.copy2(curconf, archive)
+        except(IOError, os.error) as why:
+            print(_('dispatch-conf: Error copying %(curconf)s to %(archive)s: %(reason)s; fatal') % \
+                {"curconf": curconf, "archive": archive, "reason": str(why)}, file=sys.stderr)
+
     if os.path.exists(archive + ',v'):
         os.system(RCS_LOCK + ' ' + archive)
     os.system(RCS_PUT + ' ' + archive)
@@ -142,11 +144,12 @@ def file_archive(archive, curconf, newconf, mrgconf):
 
         os.rename(archive, archive + '.1')
 
-    try:
-        shutil.copy2(curconf, archive)
-    except(IOError, os.error) as why:
-        print(_('dispatch-conf: Error copying %(curconf)s to %(archive)s: %(reason)s; fatal') % \
-              {"curconf": curconf, "archive": archive, "reason": str(why)}, file=sys.stderr)
+    if os.path.isfile(curconf):
+        try:
+            shutil.copy2(curconf, archive)
+        except(IOError, os.error) as why:
+            print(_('dispatch-conf: Error copying %(curconf)s to %(archive)s: %(reason)s; fatal') % \
+                {"curconf": curconf, "archive": archive, "reason": str(why)}, file=sys.stderr)
 
     if newconf != '':
         # Save off new config file in the archive dir with .dist.new suffix