diff --git a/admin-tools/setup-master.sh b/admin-tools/setup-master.sh index a5acffd9..cf55f0ca 100755 --- a/admin-tools/setup-master.sh +++ b/admin-tools/setup-master.sh @@ -1,5 +1,5 @@ #!/bin/bash -PYTHON_VERSION=2.7.14 +PYTHON_VERSION=2.7.15 # FIXME put some of the below in a common routine function finish { diff --git a/trepan/processor/parse/parser.py b/trepan/processor/parse/parser.py index 1625628a..fb5fa608 100644 --- a/trepan/processor/parse/parser.py +++ b/trepan/processor/parse/parser.py @@ -126,9 +126,8 @@ def p_location(self, args): location ::= FILENAME COLON NUMBER location ::= FUNCNAME - # If just a number is given, the the filename is implied + # If just a number is given, the filename is implied location ::= NUMBER - location ::= METHOD location ::= OFFSET # For tokens we accept anything. Were really just