import_catkin_packages.py: get website URL.

3 files changed, 18 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c6f67ae95754..a8f764b455c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,7 +26,7 @@ pkgbase = ros-build-tools
 	md5sums = d257f7f20384e894b0431ee61068aa96
 	md5sums = 563c9d1320a3a997db25d3087303dcfb
 	md5sums = 8d6d7eb89a12c449497b209f1a06655b
-	md5sums = 831d0ed7ad15f3d504a5c6dbb685862a
+	md5sums = a911285e4c1dfb1679f13ae0f0638863
 	md5sums = 07f5253eb3f8cb5295c32026a20ab6c0
 
 pkgname = ros-build-tools
diff --git a/PKGBUILD b/PKGBUILD
index c016ed8ec9c9..141ece61a433 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -41,5 +41,5 @@ md5sums=('8b2e864de97e97298ebfb8da471f2df1'
          'd257f7f20384e894b0431ee61068aa96'
          '563c9d1320a3a997db25d3087303dcfb'
          '8d6d7eb89a12c449497b209f1a06655b'
-         '831d0ed7ad15f3d504a5c6dbb685862a'
+         'a911285e4c1dfb1679f13ae0f0638863'
          '07f5253eb3f8cb5295c32026a20ab6c0')
diff --git a/import_catkin_packages.py b/import_catkin_packages.py
index 4506b8cf4eec..906c8f45c761 100755
--- a/import_catkin_packages.py
+++ b/import_catkin_packages.py
@@ -27,9 +27,12 @@ class PackageBase(object):
     self.licenses = package.licenses
     self.run_dependencies = list(OrderedDict.fromkeys([dependency.name for dependency in package.run_depends]))
     self.build_dependencies = list(OrderedDict.fromkeys([dependency.name for dependency in package.build_depends + package.buildtool_depends]))
+
     # Build dependencies already added:
-    if 'git' in self.build_dependencies: self.build_dependencies.remove('git')
-    if 'cmake' in self.build_dependencies: self.build_dependencies.remove('cmake')
+    if 'git' in self.build_dependencies:
+      self.build_dependencies.remove('git')
+    if 'cmake' in self.build_dependencies:
+      self.build_dependencies.remove('cmake')
 
     # Remove HTML tags from description
     self.description = re.sub('<[^<]+?>', '', package.description)
@@ -44,6 +47,12 @@ class PackageBase(object):
     # Handle quotes
     self.description = self.description.replace('"', '').replace('`', '').replace('&quot;', '').replace('\'','')
 
+    # Website URL
+    self.site_url = "http://www.ros.org/"
+    for url in package.urls:
+      if url.type == "website":
+        self.site_url = url.url
+
   def _parse_package_file(self, url):
     """
     Parses the package.xml file specified by `url`.
@@ -162,7 +171,7 @@ class Package(PackageBase):
   BUILD_TEMPLATE = """# Script generated with import_catkin_packages.py
 # For more information: https://github.com/bchretien/arch-ros-stacks
 pkgdesc="ROS - %(description)s"
-url='http://www.ros.org/'
+url='%(site_url)s'
 
 pkgname='ros-%(distro)s-%(arch_package_name)s'
 pkgver='%(package_version)s'
@@ -237,6 +246,7 @@ package() {
       'package_url': self.repository_url,
       'license': ', '.join(self.licenses),
       'description': self.description,
+      'site_url': self.site_url,
       'ros_build_dependencies': '\n  '.join(ros_build_dep),
       'ros_run_dependencies': '\n  '.join(ros_run_dep),
       'other_build_dependencies': '\n  '.join(other_build_dep),
@@ -253,7 +263,7 @@ class MetaPackage(PackageBase):
   BUILD_TEMPLATE = """# Script generated with import_catkin_packages.py
 # For more information: https://github.com/bchretien/arch-ros-stacks
 pkgdesc="ROS - %(description)s"
-url='http://www.ros.org/'
+url='%(site_url)s'
 
 pkgname='ros-%(distro)s-%(arch_package_name)s'
 pkgver='%(package_version)s'
@@ -299,6 +309,7 @@ md5sums=()
       'package_version_patch': self.version_patch,
       'license': ', '.join(self.licenses),
       'description': self.description,
+      'site_url': self.site_url,
       'ros_build_dependencies': '\n  '.join(ros_build_dep),
       'ros_run_dependencies': '\n  '.join(ros_run_dep),
       'other_build_dependencies': '\n  '.join(other_build_dep),
@@ -376,7 +387,7 @@ class DistroDescription(object):
     if self._distro['repositories'].get(name):
       try:
         return self._distro['repositories'][name]['release']
-      except KeyError, e:
+      except KeyError as e:
         print (colored("Missing %s branch for %s" % (e, name),
                        'red', attrs=['bold']))
     else: