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

Fix some variable shadowing.

Browse Source
This commit is contained in:
Andrey Smirnov
2015-01-07 16:11:13 +03:00
parent 87fbd5201b
commit 6e32e3dcf4
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/repos.go
+3 -1
View File
@@ -259,7 +259,9 @@ func apiReposPackagesAddDelete(c *gin.Context, cb func(list *deb.PackageList, p
// verify package refs and build package list // verify package refs and build package list
for _, ref := range b.PackageRefs { for _, ref := range b.PackageRefs {
p, err := context.CollectionFactory().PackageCollection().ByKey([]byte(ref)) var p *deb.Package
p, err = context.CollectionFactory().PackageCollection().ByKey([]byte(ref))
if err != nil { if err != nil {
if err == database.ErrNotFound { if err == database.ErrNotFound {
c.Fail(404, fmt.Errorf("package %s: %s", ref, err)) c.Fail(404, fmt.Errorf("package %s: %s", ref, err))
deb/publish.go
+6 -2
View File
@@ -1,6 +1,7 @@
package deb package deb
import ( import (
"bufio"
"bytes" "bytes"
"code.google.com/p/go-uuid/uuid" "code.google.com/p/go-uuid/uuid"
"encoding/json" "encoding/json"
@@ -545,7 +546,9 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP
for _, arch := range p.Architectures { for _, arch := range p.Architectures {
if pkg.MatchesArchitecture(arch) { if pkg.MatchesArchitecture(arch) {
bufWriter, err := indexes.PackageIndex(component, arch, pkg.IsUdeb).BufWriter() var bufWriter *bufio.Writer
bufWriter, err = indexes.PackageIndex(component, arch, pkg.IsUdeb).BufWriter()
if err != nil { if err != nil {
return err return err
} }
@@ -596,7 +599,8 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP
release["Origin"] = p.GetOrigin() release["Origin"] = p.GetOrigin()
release["Label"] = p.GetLabel() release["Label"] = p.GetLabel()
bufWriter, err := indexes.ReleaseIndex(component, arch, udeb).BufWriter() var bufWriter *bufio.Writer
bufWriter, err = indexes.ReleaseIndex(component, arch, udeb).BufWriter()
err = release.WriteTo(bufWriter) err = release.WriteTo(bufWriter)
if err != nil { if err != nil {