From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 17 Oct 2007 21:44:10 +0000 (-0000)
Subject: Fix the normalize_needed regex to properly match //
X-Git-Tag: v2.2_pre1~600
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1387dfcf15e55ba49aeca7e86cc37a35895706f2;p=portage.git

Fix the normalize_needed regex to properly match //
anywhere in the path. Also add support for detection
of . or .. where appropriate.

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 2b5e6efbd..d73c4a117 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -823,7 +823,7 @@ class dblink(object):
 	"""
 
 	import re
-	_normalize_needed = re.compile(r'//|^[^/]|.+/$')
+	_normalize_needed = re.compile(r'.*//.*|^[^/]|.+/$|(^|.*/)\.\.?(/.*|$)')
 
 	def __init__(self, cat, pkg, myroot, mysettings, treetype=None,
 		vartree=None):