Merge branch 'master' into deterministic-stanza-WriteTo

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
 			}
 		}
 

deb/version_test.go

@@ -5,7 +5,6 @@ import (
 )
 
 type VersionSuite struct {
-	stanza Stanza
 }
 
 var _ = Suite(&VersionSuite{})