From b10048d0e9c4a209997c3b7f44021af15f88d768 Mon Sep 17 00:00:00 2001 From: Gary Gibbons Date: Mon, 2 Jan 2012 18:05:50 -0500 Subject: git-p4: fix test for unsupported P4 Client Views Change re method in test for unsupported Client View types (containing %% or *) anywhere in the string rather than at the begining. [pw: two tests now succeed] Signed-off-by: Gary Gibbons Signed-off-by: Pete Wyckoff Signed-off-by: Junio C Hamano --- contrib/fast-import/git-p4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'contrib/fast-import') diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index d3c3ad859c..c144c8960c 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -1889,9 +1889,12 @@ class P4Sync(Command, P4UserMap): # p4 has these %%1 to %%9 arguments in specs to # reorder paths; which we can't handle (yet :) - if re.match('%%\d', v) != None: + if re.search('%%\d', v) != None: print "Sorry, can't handle %%n arguments in client specs" sys.exit(1) + if re.search('\*', v) != None: + print "Sorry, can't handle * mappings in client specs" + sys.exit(1) if v.startswith('"'): start = 1 -- cgit v1.2.3