فهرست منبع

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

jguer 3 سال پیش
والد
کامیت
2a3ddafce5
2فایلهای تغییر یافته به همراه10 افزوده شده و 10 حذف شده
  1. 2 2
      pkg/dep/depCheck.go
  2. 8 8
      po/en.po

+ 2 - 2
pkg/dep/depCheck.go

@@ -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)))

+ 8 - 8
po/en.po

@@ -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 ""