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

Adjust FileExists to differentiate between error and actual file existence

Browse Source
This commit is contained in:
Oliver Sauder
2017-11-21 11:15:51 +01:00
parent e504fdcd54
commit b2bf4f7884
8 changed files with 49 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
aptly/interfaces.go
View File

@@ -78,7 +78,7 @@ type PublishedStorage interface {
// HardLink creates a hardlink of a file
HardLink(src string, dst string) error
// FileExists returns true if path exists
FileExists(path string) bool
FileExists(path string) (bool, error)
// ReadLink returns the symbolic link pointed to by path
ReadLink(path string) (string, error)
}

14
deb/index_files.go
View File

@@ -176,20 +176,24 @@ func packageIndexByHash(file *indexFile, ext string, hash string, sum string) er
sumfilePath := filepath.Join(dst, sum)
// link already exists? do nothing
if file.parent.publishedStorage.FileExists(sumfilePath) {
exists, err := file.parent.publishedStorage.FileExists(sumfilePath)
if err != nil {
return fmt.Errorf("Acquire-By-Hash: error checking exists of file %s: %s", sumfilePath, err)
}
if exists {
return nil
}
// create the link
err := file.parent.publishedStorage.HardLink(src, sumfilePath)
err = file.parent.publishedStorage.HardLink(src, sumfilePath)
if err != nil {
return fmt.Errorf("Acquire-By-Hash: error creating hardlink %s: %s", sumfilePath, err)
}
// if a previous index file already exists exists, backup symlink
if file.parent.publishedStorage.FileExists(filepath.Join(dst, indexfile)) {
if exists, _ = file.parent.publishedStorage.FileExists(filepath.Join(dst, indexfile)); exists {
// if exists, remove old symlink
if file.parent.publishedStorage.FileExists(filepath.Join(dst, indexfile+".old")) {
if exists, _ = file.parent.publishedStorage.FileExists(filepath.Join(dst, indexfile+".old")); exists {
var link string
link, err = file.parent.publishedStorage.ReadLink(filepath.Join(dst, indexfile+".old"))
if err != nil {
@@ -204,7 +208,7 @@ func packageIndexByHash(file *indexFile, ext string, hash string, sum string) er
// create symlink
err = file.parent.publishedStorage.SymLink(filepath.Join(dst, sum), filepath.Join(dst, indexfile))
if err != nil {
return fmt.Errorf("Acquire-By-Hash: error creating symlink %s", filepath.Join(dst, indexfile))
return fmt.Errorf("Acquire-By-Hash: error creating symlink %s: %s", filepath.Join(dst, indexfile), err)
}
return nil
}

6
files/public.go
View File

@@ -259,12 +259,12 @@ func (storage *PublishedStorage) HardLink(src string, dst string) error {
}
// FileExists returns true if path exists
func (storage *PublishedStorage) FileExists(path string) bool {
func (storage *PublishedStorage) FileExists(path string) (bool, error) {
if _, err := os.Lstat(filepath.Join(storage.rootPath, path)); os.IsNotExist(err) {
return false
return false, nil
}
return true
return true, nil
}
// ReadLink returns the symbolic link pointed to by path

9
files/public_test.go
View File

@@ -107,13 +107,13 @@ func (s *PublishedStorageSuite) TestFileExists(c *C) {
err := s.storage.MkDir("ppa/dists/squeeze/")
c.Assert(err, IsNil)
exists := s.storage.FileExists("ppa/dists/squeeze/Release")
exists, _ := s.storage.FileExists("ppa/dists/squeeze/Release")
c.Check(exists, Equals, false)
err = s.storage.PutFile("ppa/dists/squeeze/Release", "/dev/null")
c.Assert(err, IsNil)
exists = s.storage.FileExists("ppa/dists/squeeze/Release")
exists, _ = s.storage.FileExists("ppa/dists/squeeze/Release")
c.Check(exists, Equals, true)
}
@@ -127,7 +127,7 @@ func (s *PublishedStorageSuite) TestSymLink(c *C) {
err = s.storage.SymLink("ppa/dists/squeeze/Release", "ppa/dists/squeeze/InRelease")
c.Assert(err, IsNil)
exists := s.storage.FileExists("ppa/dists/squeeze/InRelease")
exists, _ := s.storage.FileExists("ppa/dists/squeeze/InRelease")
c.Check(exists, Equals, true)
}
@@ -141,11 +141,10 @@ func (s *PublishedStorageSuite) TestHardLink(c *C) {
err = s.storage.HardLink("ppa/dists/squeeze/Release", "ppa/dists/squeeze/InRelease")
c.Assert(err, IsNil)
exists := s.storage.FileExists("ppa/dists/squeeze/InRelease")
exists, _ := s.storage.FileExists("ppa/dists/squeeze/InRelease")
c.Check(exists, Equals, true)
}
func (s *PublishedStorageSuite) TestRemoveDirs(c *C) {
err := s.storage.MkDir("ppa/dists/squeeze/")
c.Assert(err, IsNil)

14
s3/public.go
View File

@@ -8,6 +8,7 @@ import (
"strings"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/corehandlers"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/request"
@@ -420,13 +421,22 @@ func (storage *PublishedStorage) HardLink(src string, dst string) error {
}
// FileExists returns true if path exists
func (storage *PublishedStorage) FileExists(path string) bool {
func (storage *PublishedStorage) FileExists(path string) (bool, error) {
params := &s3.HeadObjectInput{
Bucket: aws.String(storage.bucket),
Key: aws.String(filepath.Join(storage.prefix, path)),
}
_, err := storage.s3.HeadObject(params)
return err == nil
if err != nil {
aerr, ok := err.(awserr.Error)
if ok && aerr.Code() == s3.ErrCodeNoSuchKey {
return false, nil
}
return false, err
}
return true, nil
}
// ReadLink returns the symbolic link pointed to by path.

7
s3/public_test.go
View File

@@ -298,9 +298,12 @@ func (s *PublishedStorageSuite) TestSymLink(c *C) {
func (s *PublishedStorageSuite) TestFileExists(c *C) {
s.PutFile(c, "a/b", []byte("test"))
exists := s.storage.FileExists("a/b")
exists, err := s.storage.FileExists("a/b")
c.Check(err, IsNil)
c.Check(exists, Equals, true)
exists = s.storage.FileExists("a/b.invalid")
exists, _ = s.storage.FileExists("a/b.invalid")
// Comment out as there is an error in s3test implementation
// c.Check(err, IsNil)
c.Check(exists, Equals, false)
}

13
swift/public.go
View File

@@ -286,9 +286,18 @@ func (storage *PublishedStorage) HardLink(src string, dst string) error {
}
// FileExists returns true if path exists
func (storage *PublishedStorage) FileExists(path string) bool {
func (storage *PublishedStorage) FileExists(path string) (bool, error) {
_, _, err := storage.conn.Object(storage.container, filepath.Join(storage.prefix, path))
return err == nil
if err != nil {
if err == swift.ObjectNotFound {
return false, nil
}
return false, err
}
return true, nil
}
// ReadLink returns the symbolic link pointed to by path

6
swift/public_test.go
View File

@@ -222,9 +222,11 @@ func (s *PublishedStorageSuite) TestFileExists(c *C) {
err = s.storage.PutFile("a/b.txt", filepath.Join(dir, "a"))
c.Check(err, IsNil)
exists := s.storage.FileExists("a/b.txt")
exists, err := s.storage.FileExists("a/b.txt")
c.Check(err, IsNil)
c.Check(exists, Equals, true)
exists = s.storage.FileExists("a/b.invalid")
exists, err = s.storage.FileExists("a/b.invalid")
c.Check(err, IsNil)
c.Check(exists, Equals, false)
}