mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-05-06 22:18:28 +00:00
Revert "Make files hash a type for proper JSON serialization"
This reverts commit e138212593.
This commit is contained in:
+2
-8
@@ -9,8 +9,6 @@ import (
|
||||
"strings"
|
||||
)
|
||||
|
||||
type Hash uint64
|
||||
|
||||
// Package is single instance of Debian package
|
||||
type Package struct {
|
||||
// Basic package properties
|
||||
@@ -29,7 +27,7 @@ type Package struct {
|
||||
// Is this udeb package
|
||||
IsUdeb bool
|
||||
// Hash of files section
|
||||
FilesHash Hash
|
||||
FilesHash uint64
|
||||
// Is this >= 0.6 package?
|
||||
V06Plus bool
|
||||
// Offload fields
|
||||
@@ -40,10 +38,6 @@ type Package struct {
|
||||
collection *PackageCollection
|
||||
}
|
||||
|
||||
func (h *Hash) MarshalJSON() ([]byte, error) {
|
||||
return []byte(fmt.Sprintf("\"%08x\"", *h)), nil
|
||||
}
|
||||
|
||||
// NewPackageFromControlFile creates Package from parsed Debian control file
|
||||
func NewPackageFromControlFile(input Stanza) *Package {
|
||||
result := &Package{
|
||||
@@ -404,7 +398,7 @@ func (p *Package) Files() PackageFiles {
|
||||
// UpdateFiles saves new state of files
|
||||
func (p *Package) UpdateFiles(files PackageFiles) {
|
||||
p.files = &files
|
||||
p.FilesHash = Hash(files.Hash())
|
||||
p.FilesHash = files.Hash()
|
||||
}
|
||||
|
||||
// Stanza creates original stanza from package
|
||||
|
||||
Reference in New Issue
Block a user