summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-06-17 22:04:43 +0000
committerZac Medico <zmedico@gentoo.org>2009-06-17 22:04:43 +0000
commit758d31b247052e5658e4bb9e1273e230e2a6a9f1 (patch)
tree335a67243958d0466d726c1171fe58d0c02cb24c
parent818718357bca76f2e7ad27d8c16d5414052b6980 (diff)
downloadportage-758d31b247052e5658e4bb9e1273e230e2a6a9f1.tar.gz
portage-758d31b247052e5658e4bb9e1273e230e2a6a9f1.tar.bz2
portage-758d31b247052e5658e4bb9e1273e230e2a6a9f1.zip
Allow missing ChangeLog when using git. We don't use ChangeLogs in
distributed SCMs. It will be generated on server side from scm log, before package moves to the rsync server. This is needed because we try to avoid merge collisions. Thanks to Tomas Chvatal <scarabeus@gentoo.org> for this patch. svn path=/main/trunk/; revision=13651
-rwxr-xr-xbin/repoman7
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/repoman b/bin/repoman
index 639213235..d0c4c8667 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1113,8 +1113,11 @@ for x in scanlist:
relative_path + ': %s' % error_match.group(1))
del mydigests
-
- if "ChangeLog" not in checkdirlist:
+ # Note: We don't use ChangeLogs in distributed SCMs.
+ # It will be generated on server side from scm log,
+ # before package moves to the rsync server.
+ # This is needed because we try to avoid merge collisions.
+ if vcs not in ( "git", ) and "ChangeLog" not in checkdirlist:
stats["changelog.missing"]+=1
fails["changelog.missing"].append(x+"/ChangeLog")