Skip to content

Commit

Permalink
Added better support for non-github release repositories.
Browse files Browse the repository at this point in the history
  • Loading branch information
allenh1 committed Jun 2, 2017
1 parent c4f076d commit 755e5d3
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion src/rosdistro/rosdistro.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,18 @@ def _fetch_package_xml(self, rosdistro):
self._release_tags[rosdistro] = release_tag
return package_xml, release_tag
else:
raise Exception("Non-github repositories are net yet supported by the rosdistro tool")
release_tag = 'release/{0}/{1}/{2}'.format(rosdistro, self.name, repo.version)
url = repo.url
try:
# URL extension for GitLab/BitBucket repos
url = url.replace('.git', '/raw/{0}/package.xml'.format(release_tag))
package_xml = urlopen(url).read()
self._package_xmls[rosdistro] = package_xml
self._release_tags[rosdistro] = release_tag
return package_xml, release_tag
except Exception as e:
msg = "Failed to read package.xml file from url '{0}': {1}".format(url, e))
raise RuntimeError(msg)

def get_package_xml(self, rosdistro):
if rosdistro not in self._package_xmls:
Expand Down

0 comments on commit 755e5d3

Please sign in to comment.