system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-07-21 10:16:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(deps): fix conflict line being printed in new line

Browse source
This commit is contained in:
jguer 2022-02-06 10:49:57 +01:00
parent 0e3affd876
commit 2a3ddafce5
No known key found for this signature in database
GPG key ID: 6D6CC9BEA8556B35
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/dep/depCheck.go
View file

@ -152,7 +152,7 @@ func (dp *Pool) CheckConflicts(useAsk, noConfirm, noDeps bool) (stringset.MapStr
wg.Wait()
if len(innerConflicts) != 0 {
text.Errorln(gotext.Get("\nInner conflicts found:"))
text.Errorln(gotext.Get("Inner conflicts found:"))
for name, pkgs := range innerConflicts {
str := text.SprintError(name + ":")
@ -167,7 +167,7 @@ func (dp *Pool) CheckConflicts(useAsk, noConfirm, noDeps bool) (stringset.MapStr
}
if len(conflicts) != 0 {
text.Errorln(gotext.Get("\nPackage conflicts found:"))
text.Errorln(gotext.Get("Package conflicts found:"))
for name, pkgs := range conflicts {
str := text.SprintError(gotext.Get("Installing %s will remove:", text.Cyan(name)))

16
po/en.po
View file

@ -228,6 +228,10 @@ msgstr ""
msgid "Importing keys with gpg..."
msgstr ""
#: pkg/dep/depCheck.go:155
msgid "Inner conflicts found:"
msgstr ""
#: pkg/dep/depCheck.go:173
msgid "Installing %s will remove:"
msgstr ""
@ -302,6 +306,10 @@ msgstr ""
msgid "Package Base"
msgstr ""
#: pkg/dep/depCheck.go:170
msgid "Package conflicts found:"
msgstr ""
#: pkg/menus/clean_menu.go:44
msgid "Packages to cleanBuild?"
msgstr ""
@ -431,14 +439,6 @@ msgstr ""
msgid "\nEnter a number (default=1): "
msgstr ""
#: pkg/dep/depCheck.go:155
msgid "\nInner conflicts found:"
msgstr ""
#: pkg/dep/depCheck.go:170
msgid "\nPackage conflicts found:"
msgstr ""
#: pkg/settings/errors.go:29
msgid "aborting due to user"
msgstr ""