From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 20 Jul 2009 22:13:32 +0000 (-0000)
Subject: Remove empty log files inside dblink.unmerge(). Thanks to Diego Pettenò
X-Git-Tag: v2.2_rc34~29
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8baed026a01a362583356ae9b023ecb25601fbd5;p=portage.git

Remove empty log files inside dblink.unmerge(). Thanks to Diego Pettenò
<flameeyes@gentoo.org> for reporting.

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index d92bdf9ef..fe9e8e67f 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2187,6 +2187,18 @@ class dblink(object):
 						del e
 					unlockdir(catdir_lock)
 
+		if log_path is not None:
+			try:
+				st = os.stat(log_path)
+			except OSError:
+				pass
+			else:
+				if st.st_size == 0:
+					try:
+						os.unlink(log_path)
+					except OSError:
+						pass
+
 		if log_path is not None and os.path.exists(log_path):
 			# Restore this since it gets lost somewhere above and it
 			# needs to be set for _display_merge() to be able to log.