Skip to content

Commit 99aaa0b

Browse files
authored
Parametrize release branch with distro name (#86)
1 parent de15381 commit 99aaa0b

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Diff for: tailor_distro/manage/release.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ def register_arguments(self, parser):
2626
def execute(self, rosdistro_repo, repositories, release_version, dry_run):
2727
super().execute(rosdistro_repo)
2828

29-
release_branch_name = f'release/{release_version}'
29+
rosdistro_branch_name = f'release/{release_version}'
30+
release_branch_name = f'{rosdistro_branch_name}/{rosdistro_repo.distro_name}'
3031

31-
if self.rosdistro_repo.get_branch_name() != release_branch_name:
32-
click.echo(click.style(f"rosdistro should be on '{release_branch_name}' branch", fg='red'), err=True)
32+
if self.rosdistro_repo.get_branch_name() != rosdistro_branch_name:
33+
click.echo(click.style(f"rosdistro should be on '{rosdistro_branch_name}' branch", fg='red'), err=True)
3334
return 1
3435

3536
github_token = get_github_token()

0 commit comments

Comments
 (0)