summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Ellison2016-01-26 11:07:25 -0500
committerMatthew Ellison2016-01-26 11:07:25 -0500
commit9a0e651e9af12a1c757f1e12c8db8e03aa4c97ac (patch)
tree8866e9d81f6a79b2c032df9170fa66d95f56c0d4
parent019e8c24510a794ea8e085538f4e44755313c87b (diff)
downloadaur-9a0e651e9af12a1c757f1e12c8db8e03aa4c97ac.tar.gz
Entrypoint Name Patch
Prevent conflicts with `nsenter` from `core/util-linux`. Entrypoint is now named `nsenter-py`.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD17
-rw-r--r--entrypoint-name.patch11
3 files changed, 29 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e5259111898..9b243eaf7af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
# Generated by mksrcinfo v8
-# Fri Jan 22 21:09:35 UTC 2016
+# Tue Jan 26 16:07:17 UTC 2016
pkgbase = python-nsenter
pkgdesc = Small context manager for entering Linux kernel namespaces.
pkgver = 0.2
- pkgrel = 1
+ pkgrel = 2
url = https://pypi.python.org/pypi/nsenter
arch = any
license = Apache
makedepends = python-setuptools
depends = python
source = https://pypi.python.org/packages/source/n/nsenter/nsenter-0.2.tar.gz
+ source = entrypoint-name.patch
sha256sums = 876a18cb03de85948e4cd72fd4cfda4879561b7264f5722603f6437d452a25cb
+ sha256sums = 7c2b8e23da50f937a1e3515f085eb5dc0fbb4ece188b0a2e140b4bc5a2ff62bc
pkgname = python-nsenter
diff --git a/PKGBUILD b/PKGBUILD
index 927696b7931..11db18024fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,26 @@
_pkgname='nsenter'
pkgname="python-${_pkgname}"
pkgver=0.2
-pkgrel=1
+pkgrel=2
pkgdesc='Small context manager for entering Linux kernel namespaces.'
arch=('any')
url='https://pypi.python.org/pypi/nsenter'
license=('Apache')
depends=('python')
makedepends=('python-setuptools')
-source=("https://pypi.python.org/packages/source/n/nsenter/nsenter-${pkgver}.tar.gz")
-sha256sums=('876a18cb03de85948e4cd72fd4cfda4879561b7264f5722603f6437d452a25cb')
+source=(
+ "https://pypi.python.org/packages/source/n/nsenter/nsenter-${pkgver}.tar.gz"
+ "entrypoint-name.patch"
+)
+sha256sums=(
+ '876a18cb03de85948e4cd72fd4cfda4879561b7264f5722603f6437d452a25cb'
+ '7c2b8e23da50f937a1e3515f085eb5dc0fbb4ece188b0a2e140b4bc5a2ff62bc'
+)
+
+prepare() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ patch -Np1 <"$srcdir/entrypoint-name.patch"
+}
check() {
cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/entrypoint-name.patch b/entrypoint-name.patch
new file mode 100644
index 00000000000..bccb812f276
--- /dev/null
+++ b/entrypoint-name.patch
@@ -0,0 +1,11 @@
+--- ./setup.py.old 2016-01-26 10:57:42.891058510 -0500
++++ ./setup.py 2016-01-26 10:58:03.320708183 -0500
+@@ -42,7 +42,7 @@
+ setup_requires=['flake8'],
+ install_requires=get_install_requirements('requirements.txt'),
+ packages=setuptools.find_packages(exclude=['tests', 'tests.*']),
+- entry_points={'console_scripts': ['nsenter = nsenter:main']}
++ entry_points={'console_scripts': ['nsenter-py = nsenter:main']}
+ )
+
+ if __name__ == '__main__':