diff options
| author | Benjamin Chrétien | 2014-02-23 19:32:10 +0100 |
|---|---|---|
| committer | Benjamin Chrétien | 2015-06-20 02:25:12 +0900 |
| commit | 67196be52d4f4bf2fd51123f891fb7e0302526d5 (patch) | |
| tree | 649cdcd63b40da61e815ea55e73bd4b2b3f4e389 | |
| parent | 00c3d7071bcbaa6825a5ce3e36920286246cf590 (diff) | |
| download | aur-67196be52d4f4bf2fd51123f891fb7e0302526d5.tar.gz | |
Add ros_controllers.
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rwxr-xr-x | import_catkin_packages.py | 22 |
3 files changed, 14 insertions, 12 deletions
@@ -22,7 +22,7 @@ pkgbase = ros-build-tools md5sums = d257f7f20384e894b0431ee61068aa96 md5sums = 563c9d1320a3a997db25d3087303dcfb md5sums = 8d6d7eb89a12c449497b209f1a06655b - md5sums = 5ccffb93236bf8d89c1ee5f94a68e81f + md5sums = 9c79a0b2e4918d99f6db09976e50f6fc md5sums = 07f5253eb3f8cb5295c32026a20ab6c0 pkgname = ros-build-tools @@ -40,5 +40,5 @@ md5sums=('8b2e864de97e97298ebfb8da471f2df1' 'd257f7f20384e894b0431ee61068aa96' '563c9d1320a3a997db25d3087303dcfb' '8d6d7eb89a12c449497b209f1a06655b' - '5ccffb93236bf8d89c1ee5f94a68e81f' + '9c79a0b2e4918d99f6db09976e50f6fc' '07f5253eb3f8cb5295c32026a20ab6c0') diff --git a/import_catkin_packages.py b/import_catkin_packages.py index be6d892a3c33..00d56555035c 100755 --- a/import_catkin_packages.py +++ b/import_catkin_packages.py @@ -1,6 +1,5 @@ #!/usr/bin/env python2 - from __future__ import print_function import catkin_pkg.package @@ -137,15 +136,18 @@ class PackageBase(object): """ Checks whether a currently installed PKGBUILD contains the same version. """ - f = open(pkgbuild_file, "r") - content = f.read() - pattern_pkgver = re.compile(r"pkgver='([0-9\.]*)'") - pattern_pkgver_patch = re.compile(r"_pkgver_patch=([0-9]*)") - match_pkgver = re.search(pattern_pkgver, content) - match_pkgver_patch = re.search(pattern_pkgver_patch, content) - if match_pkgver and match_pkgver_patch: - return (match_pkgver.group(1) == self.version - and match_pkgver_patch.group(1) == self.version_patch) + if os.path.isfile(pkgbuild_file): + f = open(pkgbuild_file, "r") + content = f.read() + pattern_pkgver = re.compile(r"pkgver='([0-9\.]*)'") + pattern_pkgver_patch = re.compile(r"_pkgver_patch=([0-9]*)") + match_pkgver = re.search(pattern_pkgver, content) + match_pkgver_patch = re.search(pattern_pkgver_patch, content) + if match_pkgver and match_pkgver_patch: + return (match_pkgver.group(1) == self.version + and match_pkgver_patch.group(1) == self.version_patch) + else: + return False else: return False |