Don't show package in aur/ if it is also in devel/

frebib · Mar 22, 2018 · bb211fd · bb211fd
1 parent 624851b
commit bb211fd
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/upgrade.go b/upgrade.go
@@ -139,10 +139,21 @@ func upList(dt *depTree) (aurUp upSlice, repoUp upSlice, err error) {
 
 	if len(errs) > 0 {
 		err = fmt.Errorf("%s", strings.Join(errs, "\n"))
+		return nil, nil, err
 	}
 
 	if develUp != nil {
-		aurUp = append(aurUp, develUp...)
+		names := make(stringSet)
+		for _, up := range develUp {
+			names.set(up.Name)
+		}
+		for _, up := range aurUp {
+			if !names.get(up.Name) {
+				develUp = append(develUp, up)
+			}
+		}
+
+		aurUp = develUp
 	}
 
 	return aurUp, repoUp, err