Merge "Allow hyphens in profile strings"
This commit is contained in:
commit
726d1e4315
|
@ -47,7 +47,7 @@ lowercase = ('a'|'b'|'c'|'d'|'e'|'f'|'g'|'h'|'i'|'j'|'k'|'l'|'m'|'n'|'o'|'p'
|
||||||
|'q'|'r'|'s'|'t'|'u'|'v'|'w'|'x'|'y'|'z')
|
|'q'|'r'|'s'|'t'|'u'|'v'|'w'|'x'|'y'|'z')
|
||||||
name = letterOrDigit:start (letterOrDigit|'.'|'+'|'-')+:rest
|
name = letterOrDigit:start (letterOrDigit|'.'|'+'|'-')+:rest
|
||||||
ws = ' '+
|
ws = ' '+
|
||||||
profile = ('!'?:neg <(lowercase|digit|':')+>:name) -> (neg!='!', name)
|
profile = ('!'?:neg <(lowercase|digit|':'|'-')+>:name) -> (neg!='!', name)
|
||||||
selector = ws '[' profile:p1 (ws profile)*:p2 ']' -> [p1] + p2
|
selector = ws '[' profile:p1 (ws profile)*:p2 ']' -> [p1] + p2
|
||||||
oneversion = <('<=' | '<' | '!=' | '==' | '>=' | '>')>:rel <debversion>:v -> (
|
oneversion = <('<=' | '<' | '!=' | '==' | '>=' | '>')>:rel <debversion>:v -> (
|
||||||
rel, v)
|
rel, v)
|
||||||
|
|
|
@ -189,6 +189,7 @@ class TestDepends(TestCase):
|
||||||
Depends(dedent("""\
|
Depends(dedent("""\
|
||||||
foo
|
foo
|
||||||
bar [something]
|
bar [something]
|
||||||
|
baz [platform:this platform:that-those]
|
||||||
quux [anotherthing !nothing] <=12
|
quux [anotherthing !nothing] <=12
|
||||||
"""))
|
"""))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue