Skip to content

Commit fef4cb7

Browse files
authored
Skip end-of-life distributions when checking rosdep duplicates. (#39402)
We want to allow new rosdep keys that may overlap with things that may have been released in end-of-life distributions. To do that, make sure we ignore end-of-life distributions in our rosdep duplicate checking. Signed-off-by: Chris Lalancette <[email protected]>
1 parent 0159a33 commit fef4cb7

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

scripts/check_duplicates.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,14 @@ def create_default_sources():
4242
sources = []
4343
# get all rosdistro files
4444
basedir = os.path.realpath(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..'))
45-
filepath = os.path.join(basedir, 'index.yaml')
45+
filepath = os.path.join(basedir, 'index-v4.yaml')
4646
with open(filepath) as f:
4747
content = f.read()
4848
index = yaml.safe_load(content)
49-
for distro in index['distributions']:
49+
for distro, metadata in index['distributions'].items():
50+
if metadata['distribution_status'] == 'end-of-life':
51+
# Skip end-of-life distributions
52+
continue
5053
distfile = 'file://' + basedir + '/' + distro + '/distribution.yaml'
5154
print('loading %s' % distfile)
5255
try:

0 commit comments

Comments
 (0)