From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-390298-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RCCx2-0005Bh-Qw
for garchives@archives.gentoo.org; Fri, 07 Oct 2011 16:07:09 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 944AA21C168;
Fri, 7 Oct 2011 16:07:01 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 65A8E21C168
for <gentoo-commits@lists.gentoo.org>; Fri, 7 Oct 2011 16:07:01 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0007B1B4050
for <gentoo-commits@lists.gentoo.org>; Fri, 7 Oct 2011 16:07:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 1948480042
for <gentoo-commits@lists.gentoo.org>; Fri, 7 Oct 2011 16:07:00 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <d2249e5f44ee4ae22304b4d120c4be43c6ab45d4.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: d2249e5f44ee4ae22304b4d120c4be43c6ab45d4
Date: Fri, 7 Oct 2011 16:07:00 +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
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 6c4456fe8d75df28bff399ebf461463c
commit: d2249e5f44ee4ae22304b4d120c4be43c6ab45d4
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 7 16:06:49 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Oct 7 16:06:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Dd2249e5f
repoman: tweak myupdates/myheaders commit logic
If we unconditionally exclude myremoved from myupdates, then removed
files will also be excluded from myheaders. This allows us to avoid
unnecessary separate manifest commits in cases when "myheaders" only
contained files that were being removed. Since our code always uses
myupdates + myremoved, this change in logic doesn't break anything.
---
bin/repoman | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/bin/repoman b/bin/repoman
index ec227ed..5d2a84c 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -2323,8 +2323,7 @@ else:
mymanifests.add(f)
else:
myupdates.add(f)
- if vcs in ('git', 'hg'):
- myupdates.difference_update(myremoved)
+ myupdates.difference_update(myremoved)
myupdates =3D list(myupdates)
mymanifests =3D list(mymanifests)
myheaders =3D []