vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-07-16 12:08:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #640 from smira/636-upcase-package-name

Browse Source 
Allow uppercase package name in package query expressions
This commit is contained in:
Andrey Smirnov
2017-09-18 22:34:32 +03:00
committed by GitHub
parent 985f1a17b5 50035d5bc4
commit e0aaa8bb80
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
query/syntax.go
+1 -1
View File
@@ -135,7 +135,7 @@ func (p *parser) D() deb.PackageQuery {
operator, value := p.Condition() operator, value := p.Condition()
r, _ := utf8.DecodeRuneInString(field) r, _ := utf8.DecodeRuneInString(field)
if strings.HasPrefix(field, "$") || unicode.IsUpper(r) { if strings.HasPrefix(field, "$") || (unicode.IsUpper(r) && !strings.ContainsRune(field, '_')) {
// special field or regular field // special field or regular field
q := &deb.FieldQuery{Field: field, Relation: operatorToRelation(operator), Value: value} q := &deb.FieldQuery{Field: field, Relation: operatorToRelation(operator), Value: value}
if q.Relation == deb.VersionRegexp { if q.Relation == deb.VersionRegexp {
query/syntax_test.go
+12
View File
@@ -57,6 +57,18 @@ func (s *SyntaxSuite) TestParsing(c *C) {
c.Assert(err, IsNil) c.Assert(err, IsNil)
c.Check(q, DeepEquals, &deb.PkgQuery{Pkg: "alien-data", Version: "1.3.4~dev", Arch: "i386"}) c.Check(q, DeepEquals, &deb.PkgQuery{Pkg: "alien-data", Version: "1.3.4~dev", Arch: "i386"})
l, _ = lex("query", "Alien-data_1.3.4~dev_i386")
q, err = parse(l)
c.Assert(err, IsNil)
c.Check(q, DeepEquals, &deb.PkgQuery{Pkg: "Alien-data", Version: "1.3.4~dev", Arch: "i386"})
l, _ = lex("query", "Name")
q, err = parse(l)
c.Assert(err, IsNil)
c.Check(q, DeepEquals, &deb.FieldQuery{Field: "Name"})
l, _ = lex("query", "package (> 5.3.7) {amd64}") l, _ = lex("query", "package (> 5.3.7) {amd64}")
q, err = parse(l) q, err = parse(l)