public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] portage r10207 - main/branches/2.1.2/pym
@ 2008-05-05 19:23 Zac Medico (zmedico)
  0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-05-05 19:23 UTC (permalink / raw
  To: gentoo-commits

Author: zmedico
Date: 2008-05-05 19:22:59 +0000 (Mon, 05 May 2008)
New Revision: 10207

Modified:
   main/branches/2.1.2/pym/portage.py
Log:
Add -MERGING-.* to vardbapi._excluded_dirs. (trunk r10206)


Modified: main/branches/2.1.2/pym/portage.py
===================================================================
--- main/branches/2.1.2/pym/portage.py	2008-05-05 19:22:42 UTC (rev 10206)
+++ main/branches/2.1.2/pym/portage.py	2008-05-05 19:22:59 UTC (rev 10207)
@@ -6520,7 +6520,7 @@
 
 	_excluded_dirs = ["CVS", "lost+found"]
 	_excluded_dirs = [re.escape(x) for x in _excluded_dirs]
-	_excluded_dirs = re.compile(r'^(\..*|' + \
+	_excluded_dirs = re.compile(r'^(\..*|-MERGING-.*|' + \
 		"|".join(_excluded_dirs) + r')$')
 
 	"""

-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-05-05 19:23 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-05 19:23 [gentoo-commits] portage r10207 - main/branches/2.1.2/pym Zac Medico (zmedico)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox