vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-06 05:30:57 +00:00
Code Issues Projects Releases Wiki Activity

"all" architecture doesn't match "source", fix for missing checksums while publishing.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-02-17 11:41:33 +04:00
parent e8de4db522
commit d999258744
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/package.go
Vendored
+12 -6
View File
@@ -227,7 +227,7 @@ func (p *Package) String() string {
// MatchesArchitecture checks whether packages matches specified architecture
func (p *Package) MatchesArchitecture(arch string) bool {
if p.Architecture == "all" {
if p.Architecture == "all" && arch != "source" {
return true
}
@@ -265,13 +265,19 @@ func (p *Package) Stanza() (result Stanza) {
}
if p.IsSource {
md5, sha1, sha256 := make([]string, len(p.Files)), make([]string, len(p.Files)), make([]string, len(p.Files))
md5, sha1, sha256 := make([]string, 0), make([]string, 0), make([]string, 0)
for i, f := range p.Files {
for _, f := range p.Files {
base := filepath.Base(f.Filename)
md5[i] = fmt.Sprintf(" %s %d %s\n", f.Checksums.MD5, f.Checksums.Size, base)
sha1[i] = fmt.Sprintf(" %s %d %s\n", f.Checksums.SHA1, f.Checksums.Size, base)
sha256[i] = fmt.Sprintf(" %s %d %s\n", f.Checksums.SHA256, f.Checksums.Size, base)
if f.Checksums.MD5 != "" {
md5 = append(md5, fmt.Sprintf(" %s %d %s\n", f.Checksums.MD5, f.Checksums.Size, base))
}
if f.Checksums.SHA1 != "" {
sha1 = append(sha1, fmt.Sprintf(" %s %d %s\n", f.Checksums.SHA1, f.Checksums.Size, base))
}
if f.Checksums.SHA256 != "" {
sha256 = append(sha256, fmt.Sprintf(" %s %d %s\n", f.Checksums.SHA256, f.Checksums.Size, base))
}
}
result["Files"] = strings.Join(md5, "")
debian/package_test.go
Vendored
+5
View File
@@ -177,6 +177,11 @@ func (s *PackageSuite) TestMatchesArchitecture(c *C) {
p = NewPackageFromControlFile(s.stanza)
c.Check(p.MatchesArchitecture("i386"), Equals, true)
c.Check(p.MatchesArchitecture("amd64"), Equals, true)
c.Check(p.MatchesArchitecture("source"), Equals, false)
p, _ = NewSourcePackageFromControlFile(s.sourceStanza)
c.Check(p.MatchesArchitecture("source"), Equals, true)
c.Check(p.MatchesArchitecture("amd64"), Equals, false)
}
func (s *PackageSuite) TestGetDependencies(c *C) {