浏览代码

Merge pull request #250 from Morganamilo/fg

Support db/name for groups
Morgana 7 年之前
父节点
当前提交
989096a46c
共有 3 个文件被更改,包括 14 次插入6 次删除
  1. 1 1
      dependencies.go
  2. 12 4
      install.go
  3. 1 1
      query.go

+ 1 - 1
dependencies.go

@@ -290,7 +290,7 @@ func getDepTree(pkgs []string) (*depTree, error) {
 			continue
 		}
 
-		_, isGroup := syncDb.PkgCachebyGroup(pkg)
+		_, isGroup := syncDb.PkgCachebyGroup(name)
 		if isGroup == nil {
 			continue
 		}

+ 12 - 4
install.go

@@ -104,12 +104,20 @@ func install(parser *arguments) error {
 	}
 
 	for _, pkg := range dc.Repo {
-		arguments.addTarget(pkg.Name())
+		arguments.addTarget(pkg.DB().Name() + "/" + pkg.Name())
 	}
 
-	//for _, pkg := range repoTargets {
-	//	arguments.addTarget(pkg)
-	//}
+	dbList, err := alpmHandle.SyncDbs()
+	if err != nil {
+		return err
+	}
+	for _, pkg := range repoTargets {
+		_, name := splitDbFromName(pkg)
+		_, errdb := dbList.PkgCachebyGroup(name)
+		if errdb == nil {
+			arguments.addTarget(pkg)
+		}
+	}
 
 	if len(dc.Aur) == 0 && len(arguments.targets) == 0 {
 		fmt.Println("There is nothing to do")

+ 1 - 1
query.go

@@ -249,7 +249,7 @@ func packageSlices(toCheck []string) (aur []string, repo []string, err error) {
 		found := errdb == nil
 
 		if !found {
-			_, errdb = dbList.PkgCachebyGroup(_pkg)
+			_, errdb = dbList.PkgCachebyGroup(name)
 			found = errdb == nil
 		}