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 d92bdf9efb1740558865d1f9273804671eeb5560..fe9e8e67f517fe55c72f3f05135386f856b76cff 100644 (file)
--- 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.