From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 5 Jan 2010 19:02:44 +0000 (-0000)
Subject: Handle AttributeError inside atomic_ofstream.__del__. Thanks to Cardoe for
X-Git-Tag: v2.2_rc62~36
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b815dd042bf625313a4a45724d9213260d30870d;p=portage.git

Handle AttributeError inside atomic_ofstream.__del__. Thanks to Cardoe for
reporting.

svn path=/main/trunk/; revision=15168
---

diff --git a/pym/portage/util.py b/pym/portage/util.py
index bb53b0785..ad2b8b9fe 100644
--- a/pym/portage/util.py
+++ b/pym/portage/util.py
@@ -1009,9 +1009,13 @@ class atomic_ofstream(ObjectProxy):
 	def __del__(self):
 		"""If the user does not explicitely call close(), it is
 		assumed that an error has occurred, so we abort()."""
-		f = object.__getattribute__(self, '_file')
-		if not f.closed:
-			self.abort()
+		try:
+			f = object.__getattribute__(self, '_file')
+		except AttributeError:
+			pass
+		else:
+			if not f.closed:
+				self.abort()
 		# ensure destructor from the base class is called
 		base_destructor = getattr(ObjectProxy, '__del__', None)
 		if base_destructor is not None: