[gentoo-commits] proj/portage:master commit in: bin/

["Zac Medico" <zmedico@gentoo.org>]

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=proj/portage.git;a=commit;h=d2249e5f

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 = list(myupdates)
 	mymanifests = list(mymanifests)
 	myheaders = []