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

Simplify packaging indexing by hash and stop when there is an error

Browse Source
This commit is contained in:
Oliver Sauder
2017-11-21 09:14:48 +01:00
parent 674a0e84be
commit 2e488608ca
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deb/index_files.go
+6 -19
View File
@@ -101,10 +101,8 @@ func (file *indexFile) Finalize(signer pgp.Signer) error {
return fmt.Errorf("unable to create dir: %s", err) return fmt.Errorf("unable to create dir: %s", err)
} }
hashs := []string{}
if file.acquireByHash { if file.acquireByHash {
hashs = append(hashs, "MD5Sum", "SHA1", "SHA256", "SHA512") for _, hash := range []string{"MD5Sum", "SHA1", "SHA256", "SHA512"} {
for _, hash := range hashs {
err = file.parent.publishedStorage.MkDir(filepath.Join(filedir, "by-hash", hash)) err = file.parent.publishedStorage.MkDir(filepath.Join(filedir, "by-hash", hash))
if err != nil { if err != nil {
return fmt.Errorf("unable to create dir: %s", err) return fmt.Errorf("unable to create dir: %s", err)
@@ -126,22 +124,11 @@ func (file *indexFile) Finalize(signer pgp.Signer) error {
if file.acquireByHash { if file.acquireByHash {
sums := file.parent.generatedFiles[file.relativePath+ext] sums := file.parent.generatedFiles[file.relativePath+ext]
for hash, sum := range map[string]string{"SHA512": sums.SHA512, "SHA256": sums.SHA256, "SHA1": sums.SHA1, "MD5Sum": sums.MD5} {
err = packageIndexByHash(file, ext, "SHA512", sums.SHA512) err = packageIndexByHash(file, ext, hash, sum)
if err != nil { if err != nil {
fmt.Printf("%s\n", err) return fmt.Errorf("unable to build hash file: %s", err)
} }
err = packageIndexByHash(file, ext, "SHA256", sums.SHA256)
if err != nil {
fmt.Printf("%s\n", err)
}
err = packageIndexByHash(file, ext, "SHA1", sums.SHA1)
if err != nil {
fmt.Printf("%s\n", err)
}
err = packageIndexByHash(file, ext, "MD5Sum", sums.MD5)
if err != nil {
fmt.Printf("%s\n", err)
} }
} }
} }