Explorar el Código

fix(query): remove -debug packages from missing list if base package is installed (#2372)

* chore(yay): fix pre-commit

* chore(yay): fix git ignore
Jo hace 1 año
padre
commit
26aa171b2b
Se han modificado 3 ficheros con 11 adiciones y 7 borrados
  1. 2 0
      .gitignore
  2. 3 5
      .pre-commit-config.yaml
  3. 6 2
      pkg/query/aur_warnings.go

+ 2 - 0
.gitignore

@@ -28,3 +28,5 @@ qemu-*
 *.pot
 *.po~
 *.pprof
+
+node_modules/

+ 3 - 5
.pre-commit-config.yaml

@@ -5,19 +5,17 @@ repos:
     rev: v0.5.1
     hooks:
       - id: go-fmt
-      - id: go-imports
-        args: [-local=github.com/Jguer/yay/v12/]
       - id: golangci-lint
       - id: go-unit-tests
       - id: go-build
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.4 # Use the sha or tag you want to point at
+    rev: v4.0.0-alpha.8 # Use the sha or tag you want to point at
     hooks:
       - id: prettier
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0 # Use the ref you want to point at
+    rev: v4.5.0 # Use the ref you want to point at
     hooks:
       - id: trailing-whitespace
       - id: check-json
@@ -25,7 +23,7 @@ repos:
       - id: check-added-large-files
 
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v2.38.0
+    rev: v3.15.0
     hooks:
       - id: commitizen
         stages: [commit-msg]

+ 6 - 2
pkg/query/aur_warnings.go

@@ -52,10 +52,14 @@ func (warnings *AURWarnings) AddToWarnings(remote map[string]alpm.IPackage, aurP
 	}
 }
 
-func (warnings *AURWarnings) CalculateMissing(remoteNames []string, remote map[string]alpm.IPackage, aurData map[string]*aur.Pkg) {
+func (warnings *AURWarnings) CalculateMissing(remoteNames []string,
+	remote map[string]alpm.IPackage, aurData map[string]*aur.Pkg,
+) {
 	for _, name := range remoteNames {
 		if _, ok := aurData[name]; !ok && !remote[name].ShouldIgnore() {
-			warnings.Missing = append(warnings.Missing, name)
+			if _, ok := aurData[strings.TrimSuffix(name, "-debug")]; !ok {
+				warnings.Missing = append(warnings.Missing, name)
+			}
 		}
 	}
 }