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

Style fixes.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-02-19 12:54:19 +04:00
parent d1e16a0ef0
commit bd119dbfed
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
files/package_pool.go
+9 -10
View File
@@ -3,7 +3,6 @@ package files
import ( import (
"fmt" "fmt"
"github.com/smira/aptly/aptly" "github.com/smira/aptly/aptly"
"github.com/smira/aptly/utils"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@@ -39,18 +38,18 @@ func (pool *PackagePool) RelativePath(filename string, hashMD5 string) (string,
} }
// Path returns full path to package file in pool given any name and hash of file contents // Path returns full path to package file in pool given any name and hash of file contents
func (p *PackagePool) Path(filename string, hashMD5 string) (string, error) { func (pool *PackagePool) Path(filename string, hashMD5 string) (string, error) {
relative, err := p.RelativePath(filename, hashMD5) relative, err := pool.RelativePath(filename, hashMD5)
if err != nil { if err != nil {
return "", err return "", err
} }
return filepath.Join(p.rootPath, relative), nil return filepath.Join(pool.rootPath, relative), nil
} }
// FilepathList returns file paths of all the files in the pool // FilepathList returns file paths of all the files in the pool
func (p *PackagePool) FilepathList(progress *utils.Progress) ([]string, error) { func (pool *PackagePool) FilepathList(progress aptly.Progress) ([]string, error) {
dirs, err := ioutil.ReadDir(p.rootPath) dirs, err := ioutil.ReadDir(pool.rootPath)
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
return nil, nil return nil, nil
@@ -70,12 +69,12 @@ func (p *PackagePool) FilepathList(progress *utils.Progress) ([]string, error) {
result := []string{} result := []string{}
for _, dir := range dirs { for _, dir := range dirs {
err = filepath.Walk(filepath.Join(p.rootPath, dir.Name()), func(path string, info os.FileInfo, err error) error { err = filepath.Walk(filepath.Join(pool.rootPath, dir.Name()), func(path string, info os.FileInfo, err error) error {
if err != nil { if err != nil {
return err return err
} }
if !info.IsDir() { if !info.IsDir() {
result = append(result, path[len(p.rootPath)+1:]) result = append(result, path[len(pool.rootPath)+1:])
} }
return nil return nil
}) })
@@ -92,8 +91,8 @@ func (p *PackagePool) FilepathList(progress *utils.Progress) ([]string, error) {
} }
// Remove deletes file in package pool returns its size // Remove deletes file in package pool returns its size
func (p *PackagePool) Remove(path string) (size int64, err error) { func (pool *PackagePool) Remove(path string) (size int64, err error) {
path = filepath.Join(p.rootPath, path) path = filepath.Join(pool.rootPath, path)
info, err := os.Stat(path) info, err := os.Stat(path)
if err != nil { if err != nil {