fixing bug: parsing cond. breakpoint

[pygdb.git] / GdbTerminal.py

diff --git a/GdbTerminal.py b/GdbTerminal.py
index 81a6300ca19abafd894007a865b7c47e7e6e9746..ff6dc6b37356133c8d526fbb1f02f9f0dd6c9d3a 100644 (file)
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -104,8 +104,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
                        #This line does not contain the file!
                        if not rxpos.search(line):
-                               i += 1
-                               line = bplines[i]
+                               continue
 
                        pos = string.split(line)[-1]
                        [file,lineno] = string.split(pos,":")
@@ -114,7 +113,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
                        if i+1<len(bplines) and rxcond.search(bplines[i+1]):
                                i +=1
                                line = bplines[i]
-                               pre,cond = string.split(line,"if")
+                               cond = string.join(string.split(line," if ")[1:], " if ")
                                cond = cond.strip()
 
                        bpnts += [[no, file, lineno, cond]]