mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-01-12 03:21:33 +00:00
Fix linting errors
This commit is contained in:
@@ -203,7 +203,8 @@ func packageIndexByHash(file *indexFile, ext string, hash string, sum string) er
|
||||
if file.parent.publishedStorage.FileExists(filepath.Join(dst, indexfile)) {
|
||||
// if exists, remove old symlink
|
||||
if file.parent.publishedStorage.FileExists(filepath.Join(dst, indexfile+".old")) {
|
||||
link, err := file.parent.publishedStorage.ReadLink(filepath.Join(dst, indexfile+".old"))
|
||||
var link string
|
||||
link, err = file.parent.publishedStorage.ReadLink(filepath.Join(dst, indexfile+".old"))
|
||||
if err != nil {
|
||||
file.parent.publishedStorage.Remove(link)
|
||||
}
|
||||
|
||||
@@ -393,7 +393,7 @@ func (storage *PublishedStorage) SymLink(src string, dst string) error {
|
||||
CopySource: aws.String(src),
|
||||
Key: aws.String(filepath.Join(storage.prefix, dst)),
|
||||
ACL: aws.String(storage.acl),
|
||||
Metadata: map[string]*string{
|
||||
Metadata: map[string]*string{
|
||||
"SymLink": aws.String(src),
|
||||
},
|
||||
MetadataDirective: aws.String("REPLACE"),
|
||||
@@ -426,11 +426,7 @@ func (storage *PublishedStorage) FileExists(path string) bool {
|
||||
Key: aws.String(filepath.Join(storage.prefix, path)),
|
||||
}
|
||||
_, err := storage.s3.HeadObject(params)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
return err == nil
|
||||
}
|
||||
|
||||
// ReadLink returns the symbolic link pointed to by path.
|
||||
|
||||
@@ -284,8 +284,7 @@ func (s *PublishedStorageSuite) TestLinkFromPool(c *C) {
|
||||
func (s *PublishedStorageSuite) TestSymLink(c *C) {
|
||||
s.PutFile(c, "a/b", []byte("test"))
|
||||
|
||||
var err error
|
||||
err = s.storage.SymLink("a/b", "a/b.link")
|
||||
err := s.storage.SymLink("a/b", "a/b.link")
|
||||
c.Check(err, IsNil)
|
||||
|
||||
var link string
|
||||
@@ -296,7 +295,6 @@ func (s *PublishedStorageSuite) TestSymLink(c *C) {
|
||||
c.Skip("copy not available in s3test")
|
||||
}
|
||||
|
||||
|
||||
func (s *PublishedStorageSuite) TestFileExists(c *C) {
|
||||
s.PutFile(c, "a/b", []byte("test"))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user