|
Lines 497-502
Link Here
|
| 497 |
elif os.path.isdir(os.path.join(portdir_overlay, ".hg")): |
497 |
elif os.path.isdir(os.path.join(portdir_overlay, ".hg")): |
| 498 |
vcs = "hg" |
498 |
vcs = "hg" |
| 499 |
|
499 |
|
|
|
500 |
# Note: We don't use ChangeLogs in distributed SCMs. |
| 501 |
# It will be generated on server side from scm log, |
| 502 |
# before package moves to the rsync server. |
| 503 |
# This is needed because we try to avoid merge collisions. |
| 504 |
check_changelog = vcs in ('CVS', 'SVN') |
| 505 |
|
| 500 |
vcs_local_opts = repoman_settings.get("REPOMAN_VCS_LOCAL_OPTS", "").split() |
506 |
vcs_local_opts = repoman_settings.get("REPOMAN_VCS_LOCAL_OPTS", "").split() |
| 501 |
vcs_global_opts = repoman_settings.get("REPOMAN_VCS_GLOBAL_OPTS") |
507 |
vcs_global_opts = repoman_settings.get("REPOMAN_VCS_GLOBAL_OPTS") |
| 502 |
if vcs_global_opts is None: |
508 |
if vcs_global_opts is None: |
|
Lines 1275-1285
Link Here
|
| 1275 |
relative_path + ': %s' % error_match.group(1)) |
1281 |
relative_path + ': %s' % error_match.group(1)) |
| 1276 |
|
1282 |
|
| 1277 |
del mydigests |
1283 |
del mydigests |
| 1278 |
# Note: We don't use ChangeLogs in distributed SCMs. |
1284 |
|
| 1279 |
# It will be generated on server side from scm log, |
1285 |
if check_changelog and "ChangeLog" not in checkdirlist: |
| 1280 |
# before package moves to the rsync server. |
|
|
| 1281 |
# This is needed because we try to avoid merge collisions. |
| 1282 |
if vcs not in ("git", "hg") and "ChangeLog" not in checkdirlist: |
| 1283 |
stats["changelog.missing"]+=1 |
1286 |
stats["changelog.missing"]+=1 |
| 1284 |
fails["changelog.missing"].append(x+"/ChangeLog") |
1287 |
fails["changelog.missing"].append(x+"/ChangeLog") |
| 1285 |
|
1288 |
|
|
Lines 1337-1343
Link Here
|
| 1337 |
if repolevel < 2: |
1340 |
if repolevel < 2: |
| 1338 |
ebuild_path = os.path.join(catdir, ebuild_path) |
1341 |
ebuild_path = os.path.join(catdir, ebuild_path) |
| 1339 |
ebuild_path = os.path.join(".", ebuild_path) |
1342 |
ebuild_path = os.path.join(".", ebuild_path) |
| 1340 |
if not changelog_modified and ebuild_path in new_ebuilds: |
1343 |
if check_changelog and not changelog_modified \ |
|
|
1344 |
and ebuild_path in new_ebuilds: |
| 1341 |
stats['changelog.ebuildadded'] += 1 |
1345 |
stats['changelog.ebuildadded'] += 1 |
| 1342 |
fails['changelog.ebuildadded'].append(relative_path) |
1346 |
fails['changelog.ebuildadded'].append(relative_path) |
| 1343 |
|
1347 |
|
