[gentoo-commits] proj/grs:desktop-amd64-uclibc-hardened commit in: scripts/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     c5b83c54eb6c1a0ab00bf3464d954869be9b7e6e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 09:12:25 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue May 24 09:12:54 2016 +0000
URL:        https://gitweb.gentoo.org/proj/grs.git/commit/?id=c5b83c54

scripts: add --verbose-conflicts

 scripts/cycle.2.sh | 2 +-
 scripts/cycle.3.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/cycle.2.sh b/scripts/cycle.2.sh
index ea51c78..a6f639c 100644
--- a/scripts/cycle.2.sh
+++ b/scripts/cycle.2.sh
@@ -7,5 +7,5 @@ emerge -b1q app-cdr/cdrkit
 emerge -b1q virtual/cdrtools
 emerge -b1q app-portage/grs
 install-worldconf
-emerge -bevq --keep-going --with-bdeps=y @world
+emerge -bevq --keep-going --verbose-conflicts --with-bdeps=y @world
 clean-worldconf

diff --git a/scripts/cycle.3.sh b/scripts/cycle.3.sh
index 2acd55a..41640ae 100644
--- a/scripts/cycle.3.sh
+++ b/scripts/cycle.3.sh
@@ -3,7 +3,7 @@
 source /etc/profile
 env-update
 install-worldconf
-emerge -buvNDq --keep-going --with-bdeps=y @world
+emerge -buvNDq --keep-going --verbose-conflicts --with-bdeps=y @world
 clean-worldconf
 emerge -bq --keep-going @preserved-rebuild
 emerge --depclean