vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-09 22:39:53 +00:00
Code Issues Projects Releases Wiki Activity

Introduce Package.ShortKey(): packages should have no conflict on that key in one list. #60

Browse Source
This commit is contained in:
Andrey Smirnov
2014-05-29 18:00:14 +04:00
parent dc248c5603
commit 90bba977d7
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deb/package.go
+5
View File
@@ -175,6 +175,11 @@ func (p *Package) Key(prefix string) []byte {
return []byte(fmt.Sprintf("%sP%s %s %s %08x", prefix, p.Architecture, p.Name, p.Version, p.FilesHash)) return []byte(fmt.Sprintf("%sP%s %s %s %08x", prefix, p.Architecture, p.Name, p.Version, p.FilesHash))
} }
return p.ShortKey(prefix)
}
// ShortKey returns key for the package that should be unique in one list
func (p *Package) ShortKey(prefix string) []byte {
return []byte(fmt.Sprintf("%sP%s %s %s", prefix, p.Architecture, p.Name, p.Version)) return []byte(fmt.Sprintf("%sP%s %s %s", prefix, p.Architecture, p.Name, p.Version))
} }
deb/package_test.go
+7
View File
@@ -95,6 +95,13 @@ func (s *PackageSuite) TestKey(c *C) {
c.Check(p.Key("xD"), DeepEquals, []byte("xDPi386 alien-arena-common 7.40-2")) c.Check(p.Key("xD"), DeepEquals, []byte("xDPi386 alien-arena-common 7.40-2"))
} }
func (s *PackageSuite) TestShortKey(c *C) {
p := NewPackageFromControlFile(s.stanza)
c.Check(p.ShortKey(""), DeepEquals, []byte("Pi386 alien-arena-common 7.40-2"))
c.Check(p.ShortKey("xD"), DeepEquals, []byte("xDPi386 alien-arena-common 7.40-2"))
}
func (s *PackageSuite) TestStanza(c *C) { func (s *PackageSuite) TestStanza(c *C) {
p := NewPackageFromControlFile(s.stanza.Copy()) p := NewPackageFromControlFile(s.stanza.Copy())
stanza := p.Stanza() stanza := p.Stanza()