浏览代码

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

morganamilo 7 年之前
父节点
当前提交
bb211fdbf7
共有 1 个文件被更改,包括 12 次插入1 次删除
  1. 12 1
      upgrade.go

+ 12 - 1
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