X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=GdbTerminal.py;h=f8a8614e1f3c7dd1040f616d52987233894fe74d;hb=5d8a5dbbe84a2c74de62e5c83eabd06081512e48;hp=6218d64780e18e7b2e0f515e3ecf7d90bd34ac3a;hpb=32cf025183d25d3ab1f8e398ef391f6b3616d980;p=pygdb.git

diff --git a/GdbTerminal.py b/GdbTerminal.py
index 6218d64..f8a8614 100644
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -95,8 +95,8 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 		bplines = self.__getAnswerFromCmd("info breakpoints\n")
 
 		rxbp = re.compile("^\d+\s+breakpoint")
-		rxpos = re.compile("^.* at \S+:\d+$")
-		rxcond = re.compile("^\tstop only if")
+		rxpos = re.compile("^.*at\s+\S+:\d+$")
+		rxcond = re.compile("^\s+stop only if")
 
 		bpnts = []
 		i = 1
@@ -113,13 +113,19 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 			no = string.split(line)[0]
 
 			#This line does not contain the file!
+			#Check for next line...
 			if not rxpos.search(line):
+				i += 1
+				line = bplines[i]
+			if not rxpos.search(line):
+				i += 1
 				continue
 
 			pos = string.split(line)[-1]
 			[file,lineno] = string.split(pos,":")
 			cond = None
 
+			#Look for conditions
 			if i+1<len(bplines) and rxcond.search(bplines[i+1]):
 				i +=1
 				line = bplines[i]