|
@@ -101,7 +101,7 @@ func checkInnerConflict(name string, conflict string, conflicts map[string]strin
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
- if version.Satisfies(dep) {
|
|
|
+ if version.Satisfies(dep) {
|
|
|
addMapStringSet(conflicts, name, pkg.Name())
|
|
|
return fmt.Errorf("")
|
|
|
}
|
|
@@ -113,7 +113,7 @@ func checkInnerConflict(name string, conflict string, conflicts map[string]strin
|
|
|
|
|
|
// Checks every to be installed package's conflicts against every other to be
|
|
|
// installed package and its provides.
|
|
|
-func checkForInnerConflicts(dc *depCatagories) (map[string]stringSet) {
|
|
|
+func checkForInnerConflicts(dc *depCatagories) map[string]stringSet {
|
|
|
conflicts := make(map[string]stringSet)
|
|
|
|
|
|
for _, pkg := range dc.Aur {
|
|
@@ -151,7 +151,6 @@ func checkReverseConflict(name string, provide string, conflicts map[string]stri
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
localDb.PkgCache().ForEach(func(pkg alpm.Package) error {
|
|
|
if name == pkg.Name() {
|
|
|
return nil
|
|
@@ -175,9 +174,9 @@ func checkReverseConflict(name string, provide string, conflicts map[string]stri
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
- if version == nil || version.Satisfies(dep) {
|
|
|
+ if version == nil || version.Satisfies(dep) {
|
|
|
// Todo
|
|
|
- addMapStringSet(conflicts, name, pkg.Name() + " (" + provide + ")")
|
|
|
+ addMapStringSet(conflicts, name, pkg.Name()+" ("+provide+")")
|
|
|
return fmt.Errorf("")
|
|
|
}
|
|
|
|
|
@@ -233,7 +232,7 @@ func checkConflict(name string, conflict string, conflicts map[string]stringSet)
|
|
|
}
|
|
|
|
|
|
if provide.Mod == alpm.DepModAny {
|
|
|
- addMapStringSet(conflicts, name, pkg.Name() + " (" + provide.Name + ")")
|
|
|
+ addMapStringSet(conflicts, name, pkg.Name()+" ("+provide.Name+")")
|
|
|
return fmt.Errorf("")
|
|
|
}
|
|
|
|
|
@@ -243,7 +242,7 @@ func checkConflict(name string, conflict string, conflicts map[string]stringSet)
|
|
|
}
|
|
|
|
|
|
if version.Satisfies(dep) {
|
|
|
- addMapStringSet(conflicts, name, pkg.Name() + " (" + provide.Name + ")")
|
|
|
+ addMapStringSet(conflicts, name, pkg.Name()+" ("+provide.Name+")")
|
|
|
return fmt.Errorf("")
|
|
|
}
|
|
|
|
|
@@ -259,7 +258,7 @@ func checkConflict(name string, conflict string, conflicts map[string]stringSet)
|
|
|
// Checks every to be installed package's conflicts against the names and
|
|
|
// provides of every already installed package and checks every to be installed
|
|
|
// package's name and provides against every already installed package.
|
|
|
-func checkForConflicts(dc *depCatagories) (map[string]stringSet, error) {
|
|
|
+func checkForConflicts(dc *depCatagories) (map[string]stringSet, error) {
|
|
|
conflicts := make(map[string]stringSet)
|
|
|
|
|
|
for _, pkg := range dc.Aur {
|
|
@@ -302,13 +301,13 @@ func checkForAllConflicts(dc *depCatagories) error {
|
|
|
var wg sync.WaitGroup
|
|
|
wg.Add(2)
|
|
|
|
|
|
- fmt.Println(bold(cyan("::")+ " Checking for conflicts..."))
|
|
|
+ fmt.Println(bold(cyan("::") + " Checking for conflicts..."))
|
|
|
go func() {
|
|
|
conflicts, err = checkForConflicts(dc)
|
|
|
wg.Done()
|
|
|
}()
|
|
|
|
|
|
- fmt.Println(bold(cyan("::")+ " Checking for inner conflicts..."))
|
|
|
+ fmt.Println(bold(cyan("::") + " Checking for inner conflicts..."))
|
|
|
go func() {
|
|
|
innerConflicts = checkForInnerConflicts(dc)
|
|
|
wg.Done()
|