Fixed parallel update merge

This commit is contained in:
jguer 2017-08-07 10:18:19 +01:00
commit 6e60184078
2 changed files with 30 additions and 24 deletions

View file

@ -29,11 +29,15 @@ Yay was created with a few objectives in mind and based on the design of yaourt
- `yay -Cd` cleans unneeded dependencies
- `yay -G` downloads PKGBuild from ABS or AUR
![Yay Syu](http://jguer.github.io/yay/yayupgrade.png "yay -Syu")
![Yay Qstats](http://jguer.github.io/yay/yay2.png "yay -Qstats")
![Yay NumberMenu](http://jguer.github.io/yay/yay3.png "yay gtk-theme")
### Changelog
#### 2.165
- Upgrade list now allows skipping upgrade install.
#### 2.159
- Qstats now warns about packages not available in AUR.
@ -43,7 +47,6 @@ Yay was created with a few objectives in mind and based on the design of yaourt
- Pacman backend rewritten and simplified
- Added config framework.
#### 1.115
- Added AUR completions (updates on first completion every 48h)

View file

@ -290,10 +290,14 @@ func upgradePkgs(flags []string) error {
return err
}
var repoNums []int
var aurNums []int
sort.Sort(repoUp)
fmt.Printf("\x1b[1;34;1m:: \x1b[0m\x1b[1m%d Packages to upgrade.\x1b[0m\n", len(aurUp)+len(repoUp))
repoUp.Print(len(aurUp))
aurUp.Print(0)
if !config.NoConfirm {
fmt.Print("\x1b[32mEnter packages you don't want to upgrade.\x1b[0m\nNumbers: ")
reader := bufio.NewReader(os.Stdin)
@ -304,8 +308,6 @@ func upgradePkgs(flags []string) error {
}
result := strings.Fields(string(numberBuf))
var repoNums []int
var aurNums []int
for _, numS := range result {
num, err := strconv.Atoi(numS)
if err != nil {
@ -321,6 +323,7 @@ func upgradePkgs(flags []string) error {
repoNums = append(repoNums, num)
}
}
}
if len(repoUp) != 0 {
var repoNames []string
@ -334,7 +337,7 @@ func upgradePkgs(flags []string) error {
repoNames = append(repoNames, k.Name)
}
err := passToPacman("-S", repoNames, flags)
err := passToPacman("-S", repoNames, append(flags, "--noconfirm"))
if err != nil {
fmt.Println("Error upgrading repo packages.")
}