summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Chrétien2014-04-14 22:59:00 +0200
committerBenjamin Chrétien2015-06-20 02:25:12 +0900
commit3ada161a62fa21a77a43f43e0777d5133f8291ed (patch)
treec198788b1603b36d778c8b38fc1169b6e76431a2
parenta3614d56f36d37f6009a6124744d0379571fd681 (diff)
downloadaur-3ada161a62fa21a77a43f43e0777d5133f8291ed.tar.gz
Add some object recognition packages.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rwxr-xr-ximport_catkin_packages.py8
3 files changed, 8 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a8f764b455c9..980a82932020 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,7 +26,7 @@ pkgbase = ros-build-tools
md5sums = d257f7f20384e894b0431ee61068aa96
md5sums = 563c9d1320a3a997db25d3087303dcfb
md5sums = 8d6d7eb89a12c449497b209f1a06655b
- md5sums = a911285e4c1dfb1679f13ae0f0638863
+ md5sums = 9101e246852bf67e2e64e16817062455
md5sums = 07f5253eb3f8cb5295c32026a20ab6c0
pkgname = ros-build-tools
diff --git a/PKGBUILD b/PKGBUILD
index 141ece61a433..d8cc48047fbd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -41,5 +41,5 @@ md5sums=('8b2e864de97e97298ebfb8da471f2df1'
'd257f7f20384e894b0431ee61068aa96'
'563c9d1320a3a997db25d3087303dcfb'
'8d6d7eb89a12c449497b209f1a06655b'
- 'a911285e4c1dfb1679f13ae0f0638863'
+ '9101e246852bf67e2e64e16817062455'
'07f5253eb3f8cb5295c32026a20ab6c0')
diff --git a/import_catkin_packages.py b/import_catkin_packages.py
index 906c8f45c761..fc3678ab3884 100755
--- a/import_catkin_packages.py
+++ b/import_catkin_packages.py
@@ -51,7 +51,11 @@ class PackageBase(object):
self.site_url = "http://www.ros.org/"
for url in package.urls:
if url.type == "website":
- self.site_url = url.url
+ # Some maintainers provide wrong URLs...
+ url.url = re.findall('http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]'
+ '|(?:%[0-9a-fA-F][0-9a-fA-F]))+', url.url)
+ if url.url:
+ self.site_url = url.url[0]
def _parse_package_file(self, url):
"""
@@ -144,7 +148,7 @@ class PackageBase(object):
dependency_map[package_name] = distrib["arch"]
return dependency_map
- def generate(self, exclude_dependencies=[]):
+ def generate(self, exclude_dependencies=[], rosdep_urls=[]):
raise Exception('`generate` not implemented.')
def is_same_version(self, pkgbuild_file):