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

Accept MD5 in package from 'MD5Sum' as well. #151

Browse Source
This commit is contained in:
Andrey Smirnov
2014-11-29 16:18:23 +03:00
parent 5fe442f191
commit f228ad811b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deb/package.go
+8 -1
View File
@@ -55,12 +55,18 @@ func NewPackageFromControlFile(input Stanza) *Package {
filesize, _ := strconv.ParseInt(input["Size"], 10, 64) filesize, _ := strconv.ParseInt(input["Size"], 10, 64)
md5, ok := input["MD5sum"]
if !ok {
// there are some broken repos out there with MD5 in wrong field
md5 = input["MD5Sum"]
}
result.UpdateFiles(PackageFiles{PackageFile{ result.UpdateFiles(PackageFiles{PackageFile{
Filename: filepath.Base(input["Filename"]), Filename: filepath.Base(input["Filename"]),
downloadPath: filepath.Dir(input["Filename"]), downloadPath: filepath.Dir(input["Filename"]),
Checksums: utils.ChecksumInfo{ Checksums: utils.ChecksumInfo{
Size: filesize, Size: filesize,
MD5: strings.TrimSpace(input["MD5sum"]), MD5: strings.TrimSpace(md5),
SHA1: strings.TrimSpace(input["SHA1"]), SHA1: strings.TrimSpace(input["SHA1"]),
SHA256: strings.TrimSpace(input["SHA256"]), SHA256: strings.TrimSpace(input["SHA256"]),
}, },
@@ -68,6 +74,7 @@ func NewPackageFromControlFile(input Stanza) *Package {
delete(input, "Filename") delete(input, "Filename")
delete(input, "MD5sum") delete(input, "MD5sum")
delete(input, "MD5Sum")
delete(input, "SHA1") delete(input, "SHA1")
delete(input, "SHA256") delete(input, "SHA256")
delete(input, "Size") delete(input, "Size")