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

Fix shadowed variables.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-03-24 18:39:45 +04:00
parent 5bd5e0a827
commit 140c925079
10 changed files with 49 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/cmd.go
View File

@@ -22,9 +22,9 @@ func ListPackagesRefList(reflist *debian.PackageRefList) (err error) {
packageCollection := debian.NewPackageCollection(context.database) packageCollection := debian.NewPackageCollection(context.database)
err = reflist.ForEach(func(key []byte) error { err = reflist.ForEach(func(key []byte) error {
p, err := packageCollection.ByKey(key) p, err2 := packageCollection.ByKey(key)
if err != nil { if err2 != nil {
return err return err2
} }
fmt.Printf(" %s\n", p) fmt.Printf(" %s\n", p)
return nil return nil

12
cmd/db_cleanup.go
View File

@@ -94,13 +94,13 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
context.progress.InitBar(int64(existingPackageRefs.Len()), false) context.progress.InitBar(int64(existingPackageRefs.Len()), false)
err = existingPackageRefs.ForEach(func(key []byte) error { err = existingPackageRefs.ForEach(func(key []byte) error {
pkg, err := packageCollection.ByKey(key) pkg, err2 := packageCollection.ByKey(key)
if err != nil { if err2 != nil {
return err return err2
} }
paths, err := pkg.FilepathList(context.packagePool) paths, err2 := pkg.FilepathList(context.packagePool)
if err != nil { if err2 != nil {
return err return err2
} }
referencedFiles = append(referencedFiles, paths...) referencedFiles = append(referencedFiles, paths...)
context.progress.AddBar(1) context.progress.AddBar(1)

16
cmd/repo_add.go
View File

@@ -45,15 +45,15 @@ func aptlyRepoAdd(cmd *commander.Command, args []string) error {
packageFiles := []string{} packageFiles := []string{}
for _, location := range args[1:] { for _, location := range args[1:] {
info, err := os.Stat(location) info, err2 := os.Stat(location)
if err != nil { if err2 != nil {
context.progress.ColoredPrintf("@y[!]@| @!Unable to process %s: %s@|", location, err) context.progress.ColoredPrintf("@y[!]@| @!Unable to process %s: %s@|", location, err2)
continue continue
} }
if info.IsDir() { if info.IsDir() {
err = filepath.Walk(location, func(path string, info os.FileInfo, err error) error { err2 = filepath.Walk(location, func(path string, info os.FileInfo, err3 error) error {
if err != nil { if err3 != nil {
return err return err3
} }
if info.IsDir() { if info.IsDir() {
return nil return nil
@@ -81,7 +81,6 @@ func aptlyRepoAdd(cmd *commander.Command, args []string) error {
for _, file := range packageFiles { for _, file := range packageFiles {
var ( var (
stanza debian.Stanza stanza debian.Stanza
err error
p *debian.Package p *debian.Package
) )
@@ -106,7 +105,8 @@ func aptlyRepoAdd(cmd *commander.Command, args []string) error {
continue continue
} }
checksums, err := utils.ChecksumsForFile(file) var checksums utils.ChecksumInfo
checksums, err = utils.ChecksumsForFile(file)
if err != nil { if err != nil {
return err return err
} }

9
cmd/repo_move.go
View File

@@ -51,23 +51,24 @@ func aptlyRepoMoveCopyImport(cmd *commander.Command, args []string) error {
srcRefList = srcRepo.RefList() srcRefList = srcRepo.RefList()
} else if command == "import" { } else if command == "import" {
var srcRemoteRepo *debian.RemoteRepo
repoCollection := debian.NewRemoteRepoCollection(context.database) repoCollection := debian.NewRemoteRepoCollection(context.database)
srcRepo, err := repoCollection.ByName(args[0]) srcRemoteRepo, err = repoCollection.ByName(args[0])
if err != nil { if err != nil {
return fmt.Errorf("unable to %s: %s", command, err) return fmt.Errorf("unable to %s: %s", command, err)
} }
err = repoCollection.LoadComplete(srcRepo) err = repoCollection.LoadComplete(srcRemoteRepo)
if err != nil { if err != nil {
return fmt.Errorf("unable to %s: %s", command, err) return fmt.Errorf("unable to %s: %s", command, err)
} }
if srcRepo.RefList() == nil { if srcRemoteRepo.RefList() == nil {
return fmt.Errorf("unable to %s: mirror not updated", command) return fmt.Errorf("unable to %s: mirror not updated", command)
} }
srcRefList = srcRepo.RefList() srcRefList = srcRemoteRepo.RefList()
} else { } else {
panic("unexpected command") panic("unexpected command")
} }

8
cmd/snapshot_create.go
View File

@@ -15,10 +15,12 @@ func aptlySnapshotCreate(cmd *commander.Command, args []string) error {
if len(args) == 4 && args[1] == "from" && args[2] == "mirror" { if len(args) == 4 && args[1] == "from" && args[2] == "mirror" {
// aptly snapshot create snap from mirror mirror // aptly snapshot create snap from mirror mirror
var repo *debian.RemoteRepo
repoName, snapshotName := args[3], args[0] repoName, snapshotName := args[3], args[0]
repoCollection := debian.NewRemoteRepoCollection(context.database) repoCollection := debian.NewRemoteRepoCollection(context.database)
repo, err := repoCollection.ByName(repoName) repo, err = repoCollection.ByName(repoName)
if err != nil { if err != nil {
return fmt.Errorf("unable to create snapshot: %s", err) return fmt.Errorf("unable to create snapshot: %s", err)
} }
@@ -34,10 +36,12 @@ func aptlySnapshotCreate(cmd *commander.Command, args []string) error {
} }
} else if len(args) == 4 && args[1] == "from" && args[2] == "repo" { } else if len(args) == 4 && args[1] == "from" && args[2] == "repo" {
// aptly snapshot create snap from repo repo // aptly snapshot create snap from repo repo
var repo *debian.LocalRepo
localRepoName, snapshotName := args[3], args[0] localRepoName, snapshotName := args[3], args[0]
localRepoCollection := debian.NewLocalRepoCollection(context.database) localRepoCollection := debian.NewLocalRepoCollection(context.database)
repo, err := localRepoCollection.ByName(localRepoName) repo, err = localRepoCollection.ByName(localRepoName)
if err != nil { if err != nil {
return fmt.Errorf("unable to create snapshot: %s", err) return fmt.Errorf("unable to create snapshot: %s", err)
} }

3
cmd/snapshot_pull.go
View File

@@ -127,7 +127,8 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
pL := debian.NewPackageList() pL := debian.NewPackageList()
pL.Add(pkg) pL.Add(pkg)
missing, err := pL.VerifyDependencies(context.dependencyOptions, []string{arch}, packageList, nil) var missing []debian.Dependency
missing, err = pL.VerifyDependencies(context.dependencyOptions, []string{arch}, packageList, nil)
if err != nil { if err != nil {
context.progress.ColoredPrintf("@y[!]@| @!Error while verifying dependencies for pkg %s: %s@|", pkg, err) context.progress.ColoredPrintf("@y[!]@| @!Error while verifying dependencies for pkg %s: %s@|", pkg, err)
} }

3
cmd/snapshot_verify.go
View File

@@ -44,8 +44,9 @@ func aptlySnapshotVerify(cmd *commander.Command, args []string) error {
fmt.Errorf("unable to merge sources: %s", err) fmt.Errorf("unable to merge sources: %s", err)
} }
var pL *debian.PackageList
for i := 1; i < len(snapshots); i++ { for i := 1; i < len(snapshots); i++ {
pL, err := debian.NewPackageListFromRefList(snapshots[i].RefList(), packageCollection, context.progress) pL, err = debian.NewPackageListFromRefList(snapshots[i].RefList(), packageCollection, context.progress)
if err != nil { if err != nil {
fmt.Errorf("unable to load packages: %s", err) fmt.Errorf("unable to load packages: %s", err)
} }

6
debian/list.go vendored
View File

@@ -63,9 +63,9 @@ func NewPackageListFromRefList(reflist *PackageRefList, collection *PackageColle
} }
err := reflist.ForEach(func(key []byte) error { err := reflist.ForEach(func(key []byte) error {
p, err := collection.ByKey(key) p, err2 := collection.ByKey(key)
if err != nil { if err2 != nil {
return fmt.Errorf("unable to load package with key %s: %s", key, err) return fmt.Errorf("unable to load package with key %s: %s", key, err2)
} }
if progress != nil { if progress != nil {
progress.AddBar(1) progress.AddBar(1)

7
debian/publish.go vendored
View File

@@ -10,6 +10,7 @@ import (
"github.com/smira/aptly/utils" "github.com/smira/aptly/utils"
"github.com/ugorji/go/codec" "github.com/ugorji/go/codec"
"log" "log"
"os"
"path/filepath" "path/filepath"
"sort" "sort"
"strings" "strings"
@@ -273,7 +274,8 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorage
return err return err
} }
packagesFile, err := publishedStorage.CreateFile(filepath.Join(basePath, relativePath)) var packagesFile *os.File
packagesFile, err = publishedStorage.CreateFile(filepath.Join(basePath, relativePath))
if err != nil { if err != nil {
return fmt.Errorf("unable to creates Packages file: %s", err) return fmt.Errorf("unable to creates Packages file: %s", err)
} }
@@ -324,7 +326,8 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorage
packagesFile.Close() packagesFile.Close()
checksumInfo, err := publishedStorage.ChecksumsForFile(filepath.Join(basePath, relativePath)) var checksumInfo utils.ChecksumInfo
checksumInfo, err = publishedStorage.ChecksumsForFile(filepath.Join(basePath, relativePath))
if err != nil { if err != nil {
return fmt.Errorf("unable to collect checksums: %s", err) return fmt.Errorf("unable to collect checksums: %s", err)
} }

17
debian/remote.go vendored
View File

@@ -170,8 +170,8 @@ func (repo *RemoteRepo) PackageURL(filename string) *url.URL {
// Fetch updates information about repository // Fetch updates information about repository
func (repo *RemoteRepo) Fetch(d aptly.Downloader, verifier utils.Verifier) error { func (repo *RemoteRepo) Fetch(d aptly.Downloader, verifier utils.Verifier) error {
var ( var (
release *os.File release, inrelease, releasesig *os.File
err error err error
) )
if verifier == nil { if verifier == nil {
@@ -182,7 +182,7 @@ func (repo *RemoteRepo) Fetch(d aptly.Downloader, verifier utils.Verifier) error
} }
} else { } else {
// 1. try InRelease file // 1. try InRelease file
inrelease, err := http.DownloadTemp(d, repo.ReleaseURL("InRelease").String()) inrelease, err = http.DownloadTemp(d, repo.ReleaseURL("InRelease").String())
if err != nil { if err != nil {
goto splitsignature goto splitsignature
} }
@@ -209,7 +209,7 @@ func (repo *RemoteRepo) Fetch(d aptly.Downloader, verifier utils.Verifier) error
return err return err
} }
releasesig, err := http.DownloadTemp(d, repo.ReleaseURL("Release.gpg").String()) releasesig, err = http.DownloadTemp(d, repo.ReleaseURL("Release.gpg").String())
if err != nil { if err != nil {
return err return err
} }
@@ -275,7 +275,8 @@ ok:
return fmt.Errorf("unparseable hash sum line: %#v", line) return fmt.Errorf("unparseable hash sum line: %#v", line)
} }
size, err := strconv.ParseInt(parts[1], 10, 64) var size int64
size, err = strconv.ParseInt(parts[1], 10, 64)
if err != nil { if err != nil {
return fmt.Errorf("unable to parse size: %s", err) return fmt.Errorf("unable to parse size: %s", err)
} }
@@ -395,9 +396,9 @@ func (repo *RemoteRepo) Download(progress aptly.Progress, d aptly.Downloader, pa
downloadSize := int64(0) downloadSize := int64(0)
err := list.ForEach(func(p *Package) error { err := list.ForEach(func(p *Package) error {
list, err := p.DownloadList(packagePool) list, err2 := p.DownloadList(packagePool)
if err != nil { if err2 != nil {
return err return err2
} }
p.files = nil p.files = nil