vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-07-26 13:47:40 +00:00
Code Issues Projects Releases Wiki Activity

Switch to gometalinter

Browse Source 
Only small amount of required checks is enabled,
plan is to enable more linters as issues are fixed in the code.
This commit is contained in:
Andrey Smirnov
2017-03-23 00:50:49 +03:00
parent 53e59d3765
commit 516dd7b044
80 changed files with 201 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deb/reflist.go
+4 -4
View File
@@ -110,8 +110,8 @@ func (l *PackageRefList) Strings() []string {
return result
}
// Substract returns all packages in l that are not in r
func (l *PackageRefList) Substract(r *PackageRefList) *PackageRefList {
// Subtract returns all packages in l that are not in r
func (l *PackageRefList) Subtract(r *PackageRefList) *PackageRefList {
result := &PackageRefList{Refs: make([][]byte, 0, 128)}
// pointer to left and right reflists
@@ -271,7 +271,7 @@ func (l *PackageRefList) Diff(r *PackageRefList, packageCollection *PackageColle
// Merge merges reflist r into current reflist. If overrideMatching, merge
// replaces matching packages (by architecture/name) with reference from r.
// If ignoreConflicting is set, all packages are preserved, otherwise conflciting
// If ignoreConflicting is set, all packages are preserved, otherwise conflicting
// packages are overwritten with packages from "right" snapshot.
func (l *PackageRefList) Merge(r *PackageRefList, overrideMatching, ignoreConflicting bool) (result *PackageRefList) {
var overriddenArch, overridenName []byte
@@ -328,7 +328,7 @@ func (l *PackageRefList) Merge(r *PackageRefList, overrideMatching, ignoreConfli
if overrideMatching {
if bytes.Equal(archL, overriddenArch) && bytes.Equal(nameL, overridenName) {
// this package has already been overriden on the right
// this package has already been overridden on the right
il++
continue
}