summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKartik Mohta2017-06-18 15:08:42 -0400
committerKartik Mohta2017-06-18 15:08:42 -0400
commit9d4cb77e25693659ce7428908d41ff2d37cfe9eb (patch)
tree8dbcf570e61d2ca6f96e05b306ad37b5a89eb6fd
parent6047870f91138dc9d648c51090ef7257d1d36cfa (diff)
downloadaur-9d4cb77e25693659ce7428908d41ff2d37cfe9eb.tar.gz
Add conflicts between the Python 2 & 3 packages
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e671a9e82e20..512b301565c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Thu Jun 1 00:21:26 UTC 2017
pkgbase = python-rosinstall_generator
pkgdesc = A tool to generator rosinstall files
pkgver = 0.1.13
@@ -20,6 +18,7 @@ pkgname = python-rosinstall_generator
depends = python-rosdistro
depends = python-rospkg
depends = python-yaml
+ conflicts = python2-rosinstall_generator
pkgname = python2-rosinstall_generator
depends =
@@ -29,4 +28,5 @@ pkgname = python2-rosinstall_generator
depends = python2-rosdistro
depends = python2-rospkg
depends = python2-yaml
+ conflicts = python-rosinstall_generator
diff --git a/PKGBUILD b/PKGBUILD
index 060f0e46b51a..e39fe686ce35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,12 +28,14 @@ build() {
package_python-rosinstall_generator() {
depends+=('python' 'python-argparse' 'python-catkin_pkg' 'python-rosdistro' 'python-rospkg' 'python-yaml')
+ conflicts=('python2-rosinstall_generator')
cd "${srcdir}/${_module}-${pkgver}"
python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
}
package_python2-rosinstall_generator() {
depends+=('python2' 'python2-argparse' 'python2-catkin_pkg' 'python2-rosdistro' 'python2-rospkg' 'python2-yaml')
+ conflicts=('python-rosinstall_generator')
cd "${srcdir}/${_module}-${pkgver}-python2"
python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
}