From 18792ea70cb833bdc999de27bb45637ea750f49f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 2 Mar 2010 18:24:31 +0000 Subject: [PATCH] Bug #277902 - When excluding config files, instead of using an empty file as a placeholder, use a file containing a comment like this: # empty file because --include-config=n when `quickpkg` was used (trunk r15278) svn path=/main/branches/2.1.7/; revision=15517 --- pym/portage/dbapi/vartree.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 75558a12f..56694a348 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -53,6 +53,7 @@ import logging import os as _os import stat import sys +import tempfile import time import warnings @@ -3432,8 +3433,14 @@ def tar_contents(contents, root, tar, protect=None, onProgress=None): if protect and protect(path): # Create an empty file as a place holder in order to avoid # potential collision-protect issues. - tarinfo.size = 0 - tar.addfile(tarinfo) + f = tempfile.TemporaryFile() + f.write("# empty file because --include-config=n " + \ + "when `quickpkg` was used\n") + f.flush() + f.seek(0) + tarinfo.size = os.fstat(f.fileno()).st_size + tar.addfile(tarinfo, f) + f.close() else: f = open(_unicode_encode(path, encoding=object.__getattribute__(os, '_encoding'), -- 2.26.2