Allow missing ChangeLog when using git. We don't use ChangeLogs in
authorZac Medico <zmedico@gentoo.org>
Wed, 17 Jun 2009 22:04:43 +0000 (22:04 -0000)
committerZac Medico <zmedico@gentoo.org>
Wed, 17 Jun 2009 22:04:43 +0000 (22:04 -0000)
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

bin/repoman

index 6392132350ac2d636f3cf10bf172dabe66708ae8..d0c4c8667e0f7f2a2a226d97781919a7575778db 100755 (executable)
@@ -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")