From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-534957-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 46AB31381F3
for <garchives@archives.gentoo.org>; Sat, 15 Dec 2012 22:24:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id EBB0321C022;
Sat, 15 Dec 2012 22:24:13 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6945C21C022
for <gentoo-commits@lists.gentoo.org>; Sat, 15 Dec 2012 22:24:13 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 776CD33DC7E
for <gentoo-commits@lists.gentoo.org>; Sat, 15 Dec 2012 22:24:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 16553E543C
for <gentoo-commits@lists.gentoo.org>; Sat, 15 Dec 2012 22:24:11 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <1355610233.7ff768b5d785c14f3c6951bae95a9efb836f2ed8.zmedico@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: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 7ff768b5d785c14f3c6951bae95a9efb836f2ed8
X-VCS-Branch: master
Date: Sat, 15 Dec 2012 22:24:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 06f23b24-083c-41ba-8d14-066d14ecd0d5
X-Archives-Hash: 4dbcdecf32df236bc08d7d185c59c516
commit: 7ff768b5d785c14f3c6951bae95a9efb836f2ed8
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 15 22:23:53 2012 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Dec 15 22:23:53 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7ff768b5
repoman keywords.dropped: handle * and ~*
---
bin/repoman | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/bin/repoman b/bin/repoman
index 161d87c..9087deb 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1833,8 +1833,11 @@ for x in effective_scanlist:
previous_keywords = slot_keywords.get(pkg.slot)
if previous_keywords is None:
slot_keywords[pkg.slot] = set()
- elif ebuild_archs and not live_ebuild:
+ elif ebuild_archs and "*" not in ebuild_archs and not live_ebuild:
dropped_keywords = previous_keywords.difference(ebuild_archs)
+ if dropped_keywords and "~*" in ebuild_archs:
+ dropped_keywords = [kw for kw in dropped_keywords
+ if not kw.startswith("~")]
if dropped_keywords:
stats["KEYWORDS.dropped"] += 1
fails["KEYWORDS.dropped"].append(