From 6e32e3dcf475dfcf0ab01884b390cf8c671ce571 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <Smirnov.Andrey@gmail.com>
Date: Wed, 7 Jan 2015 16:11:13 +0300
Subject: [PATCH] Fix some variable shadowing.

---
 api/repos.go   | 4 +++-
 deb/publish.go | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/api/repos.go b/api/repos.go
index 3050f028..fbfe1877 100644
--- a/api/repos.go
+++ b/api/repos.go
@@ -259,7 +259,9 @@ func apiReposPackagesAddDelete(c *gin.Context, cb func(list *deb.PackageList, p
 
 	// verify package refs and build package list
 	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 == database.ErrNotFound {
 				c.Fail(404, fmt.Errorf("package %s: %s", ref, err))
diff --git a/deb/publish.go b/deb/publish.go
index aad51faa..87989c1f 100644
--- a/deb/publish.go
+++ b/deb/publish.go
@@ -1,6 +1,7 @@
 package deb
 
 import (
+	"bufio"
 	"bytes"
 	"code.google.com/p/go-uuid/uuid"
 	"encoding/json"
@@ -545,7 +546,9 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP
 
 			for _, arch := range p.Architectures {
 				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 {
 						return err
 					}
@@ -596,7 +599,8 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP
 				release["Origin"] = p.GetOrigin()
 				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)
 				if err != nil {