From 3b5840e248da49bfaa90a708cd3343cf7572d77b Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <smirnov.andrey@gmail.com>
Date: Sun, 20 Jan 2019 00:01:17 +0300
Subject: [PATCH] Fix linter list and fix errors discovered by new staticcheck

---
 deb/remote.go       | 10 ++++------
 deb/version_test.go |  1 -
 http/download.go    |  6 +++---
 linter.json         |  1 -
 pgp/gnupg_test.go   |  3 +--
 query/lex.go        |  8 --------
 s3/server_test.go   |  1 -
 utils/utils.go      |  2 +-
 8 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/deb/remote.go b/deb/remote.go
index f49c3d576..72165baf1 100644
--- a/deb/remote.go
+++ b/deb/remote.go
@@ -540,12 +540,10 @@ func (repo *RemoteRepo) DownloadPackageIndexes(progress aptly.Progress, d aptly.
 				}
 			}
 			err = repo.packageList.Add(p)
-			if err != nil {
-				if _, ok := err.(*PackageConflictError); ok {
-					progress.ColoredPrintf("@y[!]@| @!skipping package %s: duplicate in packages index@|", p)
-				} else {
-					return err
-				}
+			if _, ok := err.(*PackageConflictError); ok {
+				progress.ColoredPrintf("@y[!]@| @!skipping package %s: duplicate in packages index@|", p)
+			} else if err != nil {
+				return err
 			}
 		}
 
diff --git a/deb/version_test.go b/deb/version_test.go
index 5558afc16..32ebbb85a 100644
--- a/deb/version_test.go
+++ b/deb/version_test.go
@@ -5,7 +5,6 @@ import (
 )
 
 type VersionSuite struct {
-	stanza Stanza
 }
 
 var _ = Suite(&VersionSuite{})
diff --git a/http/download.go b/http/download.go
index 73fb189b1..cdc8ff3d0 100644
--- a/http/download.go
+++ b/http/download.go
@@ -81,7 +81,7 @@ func (downloader *downloaderImpl) GetLength(ctx context.Context, url string) (in
 	}
 
 	if resp.ContentLength < 0 {
-		return -1, fmt.Errorf("Could not determine length of %s", url)
+		return -1, fmt.Errorf("could not determine length of %s", url)
 	}
 
 	return resp.ContentLength, nil
@@ -94,12 +94,12 @@ func (downloader *downloaderImpl) Download(ctx context.Context, url string, dest
 
 func retryableError(err error) bool {
 	switch err.(type) {
-	case net.Error:
-		return true
 	case *net.OpError:
 		return true
 	case syscall.Errno:
 		return true
+	case net.Error:
+		return true
 	}
 	return false
 }
diff --git a/linter.json b/linter.json
index 2f221d88d..50fcbd87d 100644
--- a/linter.json
+++ b/linter.json
@@ -7,7 +7,6 @@
         "deadcode",
         "goimports",
         "misspell",
-        "gosimple",
         "ineffassign",
         "staticcheck",
         "varcheck",
diff --git a/pgp/gnupg_test.go b/pgp/gnupg_test.go
index bf8305601..9ee8dfa40 100644
--- a/pgp/gnupg_test.go
+++ b/pgp/gnupg_test.go
@@ -10,8 +10,7 @@ import (
 )
 
 type GnupgSuite struct {
-	verifier Verifier
-	bins     string
+	bins string
 }
 
 var _ = Suite(&GnupgSuite{})
diff --git a/query/lex.go b/query/lex.go
index dbf595424..1aeb349f8 100644
--- a/query/lex.go
+++ b/query/lex.go
@@ -119,14 +119,6 @@ func (l *lexer) backup() {
 	l.pos -= l.width
 }
 
-// peek returns but does not consume
-// the next rune in the input.
-func (l *lexer) peek() rune {
-	r := l.next()
-	l.backup()
-	return r
-}
-
 func (l *lexer) Current() item {
 	if l.last.typ == 0 {
 		l.last = <-l.items
diff --git a/s3/server_test.go b/s3/server_test.go
index 63eb219cf..573097abe 100644
--- a/s3/server_test.go
+++ b/s3/server_test.go
@@ -73,7 +73,6 @@ type Server struct {
 type bucket struct {
 	name    string
 	acl     string
-	ctime   time.Time
 	objects map[string]*object
 }
 
diff --git a/utils/utils.go b/utils/utils.go
index 4de5f2188..598dc7c8f 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -13,7 +13,7 @@ func DirIsAccessible(filename string) error {
 	_, err := os.Stat(filename)
 	if err != nil {
 		if !os.IsNotExist(err) {
-			return fmt.Errorf("Something went wrong, %v", err)
+			return fmt.Errorf("error checking directory '%s': %s", filename, err)
 		}
 	} else {
 		if unix.Access(filename, unix.W_OK) != nil {