Skip to content

Commit 768a4df

Browse files
committed
Another tweak to bin/mergeready
- Legacy-Id: 17502
1 parent f7cf2f5 commit 768a4df

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

bin/mergeready

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,9 @@ for entry in ready:
328328
else:
329329
raise
330330
#
331-
merge_path = os.path.join(*path.split(os.path.sep)[:4])
331+
dirs = path.split(os.path.sep)
332+
dirs = dirs[:dirs.index('ietf')] if 'ietf' in dirs else dirs[:4]
333+
merge_path = os.path.join(*dirs)
332334
if not (rev, repo, merge_path) in hold:
333335
output_line = "%s %-24s ^/%s@%s" % (when.strftime("%Y-%m-%d_%H:%MZ"), who+":", merge_path, rev)
334336
all_commits[when] = (rev, repo, branch, who, merge_path)

0 commit comments

Comments
 (0)