mirror/yay
0
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2024-11-07 01:27:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'Morganamilo-fix#71'

Browse Source
This commit is contained in:
Jguer 2018-01-15 02:23:36 +09:00
commit 41e9f8694e
1 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
upgrade.go
View File

@ -138,37 +138,23 @@ loop:
return return
} }
func isIgnored(name string, groups []string, oldVersion string, newVersion string) bool { func upDevel(remote []alpm.Package, packageC chan upgrade, done chan bool) {
for _, p := range alpmConf.IgnorePkg {
if p == name {
fmt.Printf("\x1b[33mwarning:\x1b[0m %s (ignored pkg) ignoring upgrade (%s -> %s)\n", name, oldVersion, newVersion)
return true
}
}
for _, g := range alpmConf.IgnoreGroup {
for _, pg := range groups {
if g == pg {
fmt.Printf("\x1b[33mwarning:\x1b[0m %s (ignored pkg) ignoring upgrade (%s -> %s)\n", name, oldVersion, newVersion)
return true
}
}
}
return false
}
func upDevel(remoteNames []string, packageC chan upgrade, done chan bool) {
for _, e := range savedInfo { for _, e := range savedInfo {
if e.needsUpdate() { if e.needsUpdate() {
found := false found := false
for _, r := range remoteNames { var pkg alpm.Package
if r == e.Package { for _, r := range remote {
if r.Name() == e.Package {
found = true found = true
pkg = r
} }
} }
if found && !isIgnored(e.Package, nil, e.SHA[0:6], "git") { if found {
if pkg.ShouldIgnore() {
fmt.Printf("\x1b[33mwarning:\x1b[0m %s ignoring package upgrade (%s => %s)\n", pkg.Name(), pkg.Version(), "git")
} else {
packageC <- upgrade{e.Package, "devel", e.SHA[0:6], "git"} packageC <- upgrade{e.Package, "devel", e.SHA[0:6], "git"}
}
} else { } else {
removeVCSPackage([]string{e.Package}) removeVCSPackage([]string{e.Package})
} }
@ -189,7 +175,7 @@ func upAUR(remote []alpm.Package, remoteNames []string) (toUpgrade upSlice, err
if config.Devel { if config.Devel {
routines++ routines++
go upDevel(remoteNames, packageC, done) go upDevel(remote, packageC, done)
fmt.Println("\x1b[1;36;1m::\x1b[0m\x1b[1m Checking development packages...\x1b[0m") fmt.Println("\x1b[1;36;1m::\x1b[0m\x1b[1m Checking development packages...\x1b[0m")
} }
@ -221,7 +207,9 @@ func upAUR(remote []alpm.Package, remoteNames []string) (toUpgrade upSlice, err
} else if qtemp[x].Name == local[i].Name() { } else if qtemp[x].Name == local[i].Name() {
if (config.TimeUpdate && (int64(qtemp[x].LastModified) > local[i].BuildDate().Unix())) || if (config.TimeUpdate && (int64(qtemp[x].LastModified) > local[i].BuildDate().Unix())) ||
(alpm.VerCmp(local[i].Version(), qtemp[x].Version) < 0) { (alpm.VerCmp(local[i].Version(), qtemp[x].Version) < 0) {
if !isIgnored(local[i].Name(), local[i].Groups().Slice(), local[i].Version(), qtemp[x].Version) { if local[i].ShouldIgnore() {
fmt.Printf("\x1b[33mwarning:\x1b[0m %s ignoring package upgrade (%s => %s)\n", local[i].Name(), local[i].Version(), qtemp[x].Version)
} else {
packageC <- upgrade{qtemp[x].Name, "aur", local[i].Version(), qtemp[x].Version} packageC <- upgrade{qtemp[x].Name, "aur", local[i].Version(), qtemp[x].Version}
} }
} }
@ -265,11 +253,14 @@ func upRepo(local []alpm.Package) (upSlice, error) {
for _, pkg := range local { for _, pkg := range local {
newPkg := pkg.NewVersion(dbList) newPkg := pkg.NewVersion(dbList)
if newPkg != nil {
if newPkg != nil && !isIgnored(pkg.Name(), pkg.Groups().Slice(), pkg.Version(), newPkg.Version()) { if pkg.ShouldIgnore() {
fmt.Printf("\x1b[33mwarning:\x1b[0m %s ignoring package upgrade (%s => %s)\n", pkg.Name(), pkg.Version(), newPkg.Version())
} else {
slice = append(slice, upgrade{pkg.Name(), newPkg.DB().Name(), pkg.Version(), newPkg.Version()}) slice = append(slice, upgrade{pkg.Name(), newPkg.DB().Name(), pkg.Version(), newPkg.Version()})
} }
} }
}
return slice, nil return slice, nil
} }