From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 512D7138262 for ; Tue, 24 May 2016 09:11:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACBEB141E5; Tue, 24 May 2016 09:11:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F92B141E5 for ; Tue, 24 May 2016 09:11:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D7D9340C9C for ; Tue, 24 May 2016 09:11:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E83C9AA2 for ; Tue, 24 May 2016 09:11:32 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1464081174.c5b83c54eb6c1a0ab00bf3464d954869be9b7e6e.blueness@gentoo> Subject: [gentoo-commits] proj/grs:desktop-amd64-uclibc-hardened commit in: scripts/ X-VCS-Repository: proj/grs X-VCS-Files: scripts/cycle.2.sh scripts/cycle.3.sh X-VCS-Directories: scripts/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: c5b83c54eb6c1a0ab00bf3464d954869be9b7e6e X-VCS-Branch: desktop-amd64-uclibc-hardened Date: Tue, 24 May 2016 09:11:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7c8b4c31-94f6-422c-9179-13b8fae7f8ff X-Archives-Hash: 23d540be44a4d87a2e5f2c01122874a0 commit: c5b83c54eb6c1a0ab00bf3464d954869be9b7e6e Author: Anthony G. Basile gentoo org> AuthorDate: Tue May 24 09:12:25 2016 +0000 Commit: Anthony G. Basile gentoo 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