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 D5F2213838B for ; Tue, 31 Mar 2015 16:52:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80EEFE091B; Tue, 31 Mar 2015 16:52:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 32AF9E091B for ; Tue, 31 Mar 2015 16:52:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7531134084F for ; Tue, 31 Mar 2015 16:52:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35DA214EDE for ; Tue, 31 Mar 2015 16:52:34 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1427270411.f0b974c4839d3713fdeecf11eda46a2aeee233c8.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f0b974c4839d3713fdeecf11eda46a2aeee233c8 X-VCS-Branch: master Date: Tue, 31 Mar 2015 16:52:34 +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: 9ca5101f-adca-4666-b374-1a5e9bbe405d X-Archives-Hash: 5214bfb6de6c548737aa10d6ccbee268 commit: f0b974c4839d3713fdeecf11eda46a2aeee233c8 Author: Michał Górny gentoo org> AuthorDate: Tue Mar 24 09:00:04 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Mar 25 08:00:11 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f0b974c4 repoman: add --straight-to-stable (-S) option Add an option to safely allow committing ebuilds straight to stable. Before, this required either round trips with multiple commits or --force option that ignored valid QA concerns and (surprisingly to many developers) skipped some expensive QA checks. bin/repoman | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/bin/repoman b/bin/repoman index 13c220d..7101a00 100755 --- a/bin/repoman +++ b/bin/repoman @@ -191,6 +191,9 @@ def ParseArgs(argv, qahelp): parser.add_argument('-f', '--force', dest='force', default=False, action='store_true', help='Commit with QA violations') + parser.add_argument('-S', '--straight-to-stable', dest='straight_to_stable', default=False, + action='store_true', help='Allow committing straight to stable') + parser.add_argument('--vcs', dest='vcs', help='Force using specific VCS instead of autodetection') @@ -1908,18 +1911,19 @@ for x in effective_scanlist: (relative_path, len(myaux['DESCRIPTION']), max_desc_len)) keywords = myaux["KEYWORDS"].split() - stable_keywords = [] - for keyword in keywords: - if not keyword.startswith("~") and \ - not keyword.startswith("-"): - stable_keywords.append(keyword) - if stable_keywords: - if ebuild_path in new_ebuilds and catdir != "virtual": - stable_keywords.sort() - stats["KEYWORDS.stable"] += 1 - fails["KEYWORDS.stable"].append( - x + "/" + y + ".ebuild added with stable keywords: %s" % \ - " ".join(stable_keywords)) + if not options.straight_to_stable: + stable_keywords = [] + for keyword in keywords: + if not keyword.startswith("~") and \ + not keyword.startswith("-"): + stable_keywords.append(keyword) + if stable_keywords: + if ebuild_path in new_ebuilds and catdir != "virtual": + stable_keywords.sort() + stats["KEYWORDS.stable"] += 1 + fails["KEYWORDS.stable"].append( + relative_path + " added with stable keywords: %s" % \ + " ".join(stable_keywords)) ebuild_archs = set(kw.lstrip("~") for kw in keywords \ if not kw.startswith("-"))