vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-11 06:24:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix variable shadowing.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-04-08 11:53:02 +04:00
parent 55807412a1
commit 470571c7db
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/db_cleanup.go
+3 -2
View File
@@ -126,9 +126,10 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
if len(filesToDelete) > 0 { if len(filesToDelete) > 0 {
context.Progress().InitBar(int64(len(filesToDelete)), false) context.Progress().InitBar(int64(len(filesToDelete)), false)
totalSize := int64(0)
var size, totalSize int64
for _, file := range filesToDelete { for _, file := range filesToDelete {
size, err := context.PackagePool().Remove(file) size, err = context.PackagePool().Remove(file)
if err != nil { if err != nil {
return err return err
} }
cmd/publish_snapshot.go
+4 -2
View File
@@ -31,7 +31,8 @@ func aptlyPublishSnapshotOrRepo(cmd *commander.Command, args []string) error {
) )
if cmd.Name() == "snapshot" { if cmd.Name() == "snapshot" {
snapshot, err := context.CollectionFactory().SnapshotCollection().ByName(name) var snapshot *deb.Snapshot
snapshot, err = context.CollectionFactory().SnapshotCollection().ByName(name)
if err != nil { if err != nil {
return fmt.Errorf("unable to publish: %s", err) return fmt.Errorf("unable to publish: %s", err)
} }
@@ -44,7 +45,8 @@ func aptlyPublishSnapshotOrRepo(cmd *commander.Command, args []string) error {
source = snapshot source = snapshot
message = fmt.Sprintf("Snapshot %s", snapshot.Name) message = fmt.Sprintf("Snapshot %s", snapshot.Name)
} else if cmd.Name() == "repo" { } else if cmd.Name() == "repo" {
localRepo, err := context.CollectionFactory().LocalRepoCollection().ByName(name) var localRepo *deb.LocalRepo
localRepo, err = context.CollectionFactory().LocalRepoCollection().ByName(name)
if err != nil { if err != nil {
return fmt.Errorf("unable to publish: %s", err) return fmt.Errorf("unable to publish: %s", err)
} }