vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-02 04:50:49 +00:00
Code Issues Projects Releases Wiki Activity

since -dbgsym is for each binary package use that for PackageQuery

Browse Source
This commit is contained in:
Szymon Sobik
2017-03-08 10:31:44 +01:00
parent a0832adfa5
commit 1b80d55ea4
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deb/changes.go
+10 -4
View File
@@ -179,18 +179,24 @@ func (c *Changes) PackageQuery() (PackageQuery, error) {
var binaryQuery PackageQuery var binaryQuery PackageQuery
if len(c.Binary) > 0 { if len(c.Binary) > 0 {
binaryQuery = &FieldQuery{Field: "Name", Relation: VersionEqual, Value: c.Binary[0]} binaryQuery = &FieldQuery{Field: "Name", Relation: VersionEqual, Value: c.Binary[0]}
// matching debug ddeb packages, they're not present in the Binary field
var ddebQuery PackageQuery
ddebQuery = &FieldQuery{Field: "Name", Relation: VersionEqual, Value: fmt.Sprintf("%s-dbgsym", c.Binary[0])}
for _, binary := range c.Binary[1:] { for _, binary := range c.Binary[1:] {
binaryQuery = &OrQuery{ binaryQuery = &OrQuery{
L: &FieldQuery{Field: "Name", Relation: VersionEqual, Value: binary}, L: &FieldQuery{Field: "Name", Relation: VersionEqual, Value: binary},
R: binaryQuery, R: binaryQuery,
} }
ddebQuery = &OrQuery{
L: &FieldQuery{Field: "Name", Relation: VersionEqual, Value: fmt.Sprintf("%s-dbgsym", binary)},
R: ddebQuery,
}
} }
// matching debug ddeb packages, they're not present in the Binary field
var ddebQuery PackageQuery
ddebQuery = &AndQuery{ ddebQuery = &AndQuery{
L: &FieldQuery{Field: "Name", Relation: VersionPatternMatch, Value: "*-dbgsym"}, L: &FieldQuery{Field: "Source", Relation: VersionEqual, Value: c.Source},
R: &FieldQuery{Field: "Source", Relation: VersionEqual, Value: c.Source}, R: ddebQuery,
} }
binaryQuery = &OrQuery{ binaryQuery = &OrQuery{