Fix equery belongs to strip multiple slashes from path names. (Bug #234584)

svn path=/; revision=505

1 files changed, 4 insertions, 3 deletions

diff --git a/trunk/src/equery/equery b/trunk/src/equery/equery
index ed8c5c4..63eb8b3 100755
--- a/trunk/src/equery/equery
+++ b/trunk/src/equery/equery
@@ -369,12 +369,13 @@ class CmdListBelongs(Command):
 		if opts["fullRegex"]:
 			q = query
 		else:
-			# Trim trailing slash from query
+			# Trim trailing and multiple slashes from query 
 			for i in range(0, len(query)):
-				if (query[i][-1] == "/"):
-					query[i] = query[i][:-1]
+				query[i] = re.compile('/+').sub('/', query[i])
+				query[i] = query[i].rstrip('/')
 			q = map(lambda x: ((len(x) and x[0] == "/") and "^" or "/")
 			                   + re.escape(x) + "$", query)
+			print q
 		try:
 			q = "|".join(q)
 			rx = re.compile(q)