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 DE096138263 for ; Tue, 24 May 2016 09:11:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CD3C141A2; Tue, 24 May 2016 09:11:37 +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 1582A141A2 for ; Tue, 24 May 2016 09:11:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 DA433340CAC 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 C1EBD974 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: <1464081145.0a46f47682510eb7af1cb23dc1b9fada948ec172.blueness@gentoo> Subject: [gentoo-commits] proj/grs:desktop-amd64-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: 0a46f47682510eb7af1cb23dc1b9fada948ec172 X-VCS-Branch: desktop-amd64-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: ab0f8464-f29d-4752-83bb-468a81f76644 X-Archives-Hash: 7f7011400019a0b4c4632986ae786ef2 commit: 0a46f47682510eb7af1cb23dc1b9fada948ec172 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:25 2016 +0000 URL: https://gitweb.gentoo.org/proj/grs.git/commit/?id=0a46f476 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 148a344..599dec8 100644 --- a/scripts/cycle.2.sh +++ b/scripts/cycle.2.sh @@ -7,5 +7,5 @@ emerge -b1q app-portage/grs emerge --unmerge sys-fs/udev emerge -b1q sys-fs/eudev 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