summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Chrétien2015-08-24 13:35:57 +0900
committerBenjamin Chrétien2015-08-24 16:01:55 +0900
commitd04f9936dffd8825f583e1c26eb7d7d7b120b73c (patch)
treeb27bf74114a2811004a6e81c106f4acf42f3cf95
parentdf2fd86b44091aff304f6c95da37c347eb256334 (diff)
downloadaur-d04f9936dffd8825f583e1c26eb7d7d7b120b73c.tar.gz
import_catkin_packages.py: fix metapackage generation
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rwxr-xr-ximport_catkin_packages.py6
3 files changed, 8 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 27c25d1aee4d..ea594000ac88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ros-build-tools
pkgdesc = Utilities for building arch packages for ROS stacks.
- pkgver = 0.1.0
- pkgrel = 5
+ pkgver = 0.1.2
+ pkgrel = 1
url = https://github.com/bchretien/arch-ros-stacks
arch = i686
arch = x86_64
@@ -28,7 +28,7 @@ pkgbase = ros-build-tools
md5sums = d257f7f20384e894b0431ee61068aa96
md5sums = 563c9d1320a3a997db25d3087303dcfb
md5sums = 8d6d7eb89a12c449497b209f1a06655b
- md5sums = 6686b653fd628d8cd31bd46ed7a33053
+ md5sums = 590922c9cb12d6e2f8e295df241e08ef
md5sums = 07f5253eb3f8cb5295c32026a20ab6c0
pkgname = ros-build-tools
diff --git a/PKGBUILD b/PKGBUILD
index d0614708726e..bbc1a70c7130 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgdesc='Utilities for building arch packages for ROS stacks.'
url="https://github.com/bchretien/arch-ros-stacks"
pkgname='ros-build-tools'
-pkgver='0.1.1'
+pkgver='0.1.2'
arch=('i686' 'x86_64')
pkgrel=1
license=('BSD')
@@ -48,5 +48,5 @@ md5sums=('ed01573e0ecc0f7ca451d7e2849cc5ee'
'd257f7f20384e894b0431ee61068aa96'
'563c9d1320a3a997db25d3087303dcfb'
'8d6d7eb89a12c449497b209f1a06655b'
- '2f284263bd513b4fa460ed305d0425e2'
+ '590922c9cb12d6e2f8e295df241e08ef'
'07f5253eb3f8cb5295c32026a20ab6c0')
diff --git a/import_catkin_packages.py b/import_catkin_packages.py
index 1e43fc5c42c5..4aeda23603dc 100755
--- a/import_catkin_packages.py
+++ b/import_catkin_packages.py
@@ -608,9 +608,9 @@ def generate_pkgbuild(distro, package, directory, force=False,
generated.add(package.name)
- if package.packages:
- for child_package in package.packages:
- generate_pkgbuild(distro, child_package, directory,
+ if distro._is_meta_package(package.name):
+ for child_name in distro.meta_package_package_names(package.name):
+ generate_pkgbuild(distro, distro.package(child_name), directory,
force=force,
exclude_dependencies=exclude_dependencies,
no_overwrite=no_overwrite, recursive=recursive,