summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorchr0mag2018-01-23 20:42:17 -0800
committerchr0mag2018-01-23 20:42:17 -0800
commit4d075b99eba0f5dc853c8ad6c153e210838ce698 (patch)
treec108cc4ce59391b42ca55e883e4e01f947fed2a2
parent0e16adff1d744cc58d73f2c2144327befec68bd2 (diff)
downloadaur-4d075b99eba0f5dc853c8ad6c153e210838ce698.tar.gz
Implemented check function. Add arch.py in prepare instead of build.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
2 files changed, 10 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6c1b721e833d..74cb0eac0333 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,13 @@
pkgbase = sos
pkgdesc = A unified tool for collecting system logs and other debug information
pkgver = 3.5
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/sosreport/sos
arch = any
license = GPL2
makedepends = python-sphinx
+ makedepends = python-nose
+ makedepends = python-coverage
depends = python
depends = python-six
depends = python-lxml
diff --git a/PKGBUILD b/PKGBUILD
index 4ea61399a8e3..dc88f5df6a8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: chr0mag <phillips.julian AT gmail DOT com>
pkgname=sos
pkgver=3.5
-pkgrel=1
+pkgrel=2
epoch=
pkgdesc="A unified tool for collecting system logs and other debug information"
arch=('any')
@@ -13,7 +13,7 @@ depends=('python'
'python-lxml'
'xz'
'tar')
-makedepends=('python-sphinx')
+makedepends=('python-sphinx' 'python-nose' 'python-coverage')
checkdepends=()
optdepends=()
provides=()
@@ -34,7 +34,10 @@ validpgpkeys=()
prepare() {
cd "$pkgname-$pkgver"
+ # fix for: https://github.com/sosreport/sos/commit/0b30e8f72c3c669455209d15b1eb01de20c7d578
patch sos/plugins/haproxy.py < ../../$_urlparsefix
+ #add basic Arch policy
+ cp ../../arch.py sos/policies
}
build() {
@@ -44,6 +47,7 @@ build() {
check() {
cd "$pkgname-$pkgver"
+ make test
}
package() {
@@ -53,8 +57,6 @@ package() {
mkdir ${pkgdir}/usr/bin
mv ${pkgdir}/usr/sbin/sosreport ${pkgdir}/usr/bin
rmdir ${pkgdir}/usr/sbin
- #add basic Arch policy
- cp ../../arch.py ${pkgdir}/usr/lib/python3.6/site-packages/sos/policies
- #disable plugins that cause issues
+ #workaround for: https://github.com/sosreport/sos/issues/77
sed --in-place 's/#disable = rpm, selinux, dovecot/disable = rpm, selinux, dovecot, sunrpc, nfsserver, distupgrade/' ${pkgdir}/etc/sos.conf
}