opendev
/
bindep
Code Issues Proposed changes

Merge "Allow hyphens in profile strings"

This commit is contained in:
Jenkins 2015-05-04 03:09:44 +00:00 committed by Gerrit Code Review
parent 571e3a5451 17c20143f8
commit 726d1e4315
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bindep/depends.py
View File

@ -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')
name = letterOrDigit:start (letterOrDigit|'.'|'+'|'-')+:rest
ws = ' '+
profile = ('!'?:neg <(lowercase|digit|':')+>:name) -> (neg!='!', name)
profile = ('!'?:neg <(lowercase|digit|':'|'-')+>:name) -> (neg!='!', name)
selector = ws '[' profile:p1 (ws profile)*:p2 ']' -> [p1] + p2
oneversion = <('<=' | '<' | '!=' | '==' | '>=' | '>')>:rel <debversion>:v -> (
rel, v)

1
bindep/tests/test_depends.py
View File

@ -189,6 +189,7 @@ class TestDepends(TestCase):
Depends(dedent("""\
foo
bar [something]
baz [platform:this platform:that-those]
quux [anotherthing !nothing] <=12
"""))