Attachment #246057 for bug #257260

Lines 24-29 if [[ ! -d ${D}${infodir} ]] ; then Link Here

(-)a/bin/ebuild-helpers/prepinfo (+3 lines)
24	fi	24	fi
25		25
26	find "${D}${infodir}" -type d -print0 \| while read -d $'\0' x ; do	26	find "${D}${infodir}" -type d -print0 \| while read -d $'\0' x ; do
		27	for f in "${x}"/.keepinfodir*; do
		28	[[ -e ${f} ]] && continue 2
		29	done
27	rm -f "${x}"/dir{,.info}{,.gz,.bz2}	30	rm -f "${x}"/dir{,.info}{,.gz,.bz2}
28	done	31	done
29		32

Lines 107-117 def chk_updated_info_files(root, infodirs, prev_mtimes, retval): Link Here

(-)a/pym/_emerge/main.py (-6 / +7 lines)
107	if z=='':	107	if z=='':
108	continue	108	continue
109	inforoot=normpath(root+z)	109	inforoot=normpath(root+z)
110	if os.path.isdir(inforoot):	110	if os.path.isdir(inforoot) and \
111	infomtime = os.stat(inforoot)[stat.ST_MTIME]	111	not [x for x in os.listdir(inforoot) \
112	if inforoot not in prev_mtimes or \	112	if x.startswith('.keepinfodir')]:
113	prev_mtimes[inforoot] != infomtime:	113	infomtime = os.stat(inforoot)[stat.ST_MTIME]
114	regen_infodirs.append(inforoot)	114	if inforoot not in prev_mtimes or \
		115	prev_mtimes[inforoot] != infomtime:
		116	regen_infodirs.append(inforoot)
115		117
116	if not regen_infodirs:	118	if not regen_infodirs:
117	portage.writemsg_stdout("\n")	119	portage.writemsg_stdout("\n")
118	-

Return to bug 257260