summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-10-07 09:06:49 -0700
committerZac Medico <zmedico@gentoo.org>2011-10-07 09:06:49 -0700
commitd2249e5f44ee4ae22304b4d120c4be43c6ab45d4 (patch)
tree0556697cfb61540d4316df0661c8b25b464e5705 /bin
parentae260804da9689c69fad3775d8a4be31b34a087d (diff)
downloadportage-d2249e5f44ee4ae22304b4d120c4be43c6ab45d4.tar.gz
portage-d2249e5f44ee4ae22304b4d120c4be43c6ab45d4.tar.bz2
portage-d2249e5f44ee4ae22304b4d120c4be43c6ab45d4.zip
repoman: tweak myupdates/myheaders commit logicv2.2.0_alpha63
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.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/repoman3
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/repoman b/bin/repoman
index ec227ed41..5d2a84c5f 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 = []