From 8d358837ee5348d62a6ce15f9fcd009a71cff769 Mon Sep 17 00:00:00 2001
From: Pablo Castellano <pablo@anche.no>
Date: Fri, 11 Aug 2017 01:58:28 +0200
Subject: [PATCH] Minor fixes (#360)

* aports: Use $install variable inside $source

So these files also get fingerprinted

* qemu: Use shutil.which instead of pmb.helpers.run.user

* Fix typo in comment
---
 aports/kde/media-player-info/APKBUILD       |  6 +++---
 aports/kde/plasma-mobile/APKBUILD           | 11 +++++++----
 aports/kde/plasma-phone-components/APKBUILD | 11 +++++++----
 pmb/qemu/run.py                             |  8 ++++----
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/aports/kde/media-player-info/APKBUILD b/aports/kde/media-player-info/APKBUILD
index 917f8ae6..624bd515 100644
--- a/aports/kde/media-player-info/APKBUILD
+++ b/aports/kde/media-player-info/APKBUILD
@@ -1,15 +1,15 @@
 pkgname=media-player-info
 pkgver=22
-pkgrel=1
+pkgrel=2
 pkgdesc="Data files describing media player capabilities, for post-HAL systems"
 arch="noarch"
 license="BSD"
 url="http://cgit.freedesktop.org/media-player-info/"
 depends="eudev"
 makedepends="python3 eudev-dev"
-source="http://www.freedesktop.org/software/media-player-info/$pkgname-$pkgver.tar.gz
-		$pkgname.post-install"
 install="$pkgname.post-install"
+source="http://www.freedesktop.org/software/media-player-info/$pkgname-$pkgver.tar.gz
+		$install"
 
 build() {
 	./configure --prefix=/usr \
diff --git a/aports/kde/plasma-mobile/APKBUILD b/aports/kde/plasma-mobile/APKBUILD
index d74a199b..6254ce8d 100644
--- a/aports/kde/plasma-mobile/APKBUILD
+++ b/aports/kde/plasma-mobile/APKBUILD
@@ -1,17 +1,17 @@
 pkgname=plasma-mobile
 pkgver=5845.8005327e
-pkgrel=1
+pkgrel=2
 pkgdesc="Plasma Mobile"
 arch="all"
 url="https://community.kde.org/Plasma/Mobile"
 license="GPL3"
 depends="plasma-workspace kio"
 makedepends="extra-cmake-modules baloo kdoctools plasma-workspace qt5-qtdeclarative-dev kio-dev kdelibs4support"
-source="$pkgname-$pkgver.tar.gz::https://github.com/KDE/$pkgname/archive/master.tar.gz	
-		$install"
 install="$pkgname.post-install
 		 $pkgname.post-upgrade
 		 $pkgname.post-deinstall"
+source="$pkgname-$pkgver.tar.gz::https://github.com/KDE/$pkgname/archive/master.tar.gz
+		$install"
 
 prepare() {
 	mkdir -p $srcdir/build
@@ -32,4 +32,7 @@ package() {
 	cd $srcdir/build
 	make DESTDIR="$pkgdir/" install
 }
-sha512sums="dc0ea3172e2bcdec972bf4d7a74e1e4a97de5e6d32adc6f4e36c3de57cf44529ea866ba9ee1c3014f2aaffee1e7b41c229358f6c997bcecf7f9262c95b0fa1b9  plasma-mobile-5845.8005327e.tar.gz"
+sha512sums="dc0ea3172e2bcdec972bf4d7a74e1e4a97de5e6d32adc6f4e36c3de57cf44529ea866ba9ee1c3014f2aaffee1e7b41c229358f6c997bcecf7f9262c95b0fa1b9  plasma-mobile-5845.8005327e.tar.gz
+48ab9fb5279fe9dde44ef92f990eba98adc16180a3832c11e17c091ad719962d3b703fa746bb20048dd18f98e087cdbce930148e5f2b2de085eebe2fd64164a0  plasma-mobile.post-install
+48ab9fb5279fe9dde44ef92f990eba98adc16180a3832c11e17c091ad719962d3b703fa746bb20048dd18f98e087cdbce930148e5f2b2de085eebe2fd64164a0  plasma-mobile.post-upgrade
+48ab9fb5279fe9dde44ef92f990eba98adc16180a3832c11e17c091ad719962d3b703fa746bb20048dd18f98e087cdbce930148e5f2b2de085eebe2fd64164a0  plasma-mobile.post-deinstall"
diff --git a/aports/kde/plasma-phone-components/APKBUILD b/aports/kde/plasma-phone-components/APKBUILD
index a90cb197..98bebc33 100644
--- a/aports/kde/plasma-phone-components/APKBUILD
+++ b/aports/kde/plasma-phone-components/APKBUILD
@@ -1,17 +1,17 @@
 pkgname=plasma-phone-components
 pkgver=682.b79bb13
-pkgrel=1
+pkgrel=2
 pkgdesc="Modules providing phone functionality for Plasma"
 arch="all"
 url="https://community.kde.org/Plasma/Mobile"
 license="GPL3"
 depends="plasma-workspace kpeople telepathy-qt qt5-qtgraphicaleffects"
 makedepends="kpeople telepathy-qt"
-source="$pkgname-$pkgver.tar.gz::https://github.com/KDE/$pkgname/archive/master.tar.gz
-		$install"
 install="$pkgname.post-install
 		 $pkgname.post-upgrade
 		 $pkgname.post-deinstall"
+source="$pkgname-$pkgver.tar.gz::https://github.com/KDE/$pkgname/archive/master.tar.gz
+		$install"
 
 prepare() {
 	mkdir -p $srcdir/build
@@ -33,4 +33,7 @@ package() {
 	cd $srcdir/build
 	make DESTDIR="$pkgdir/" install
 }
-sha512sums="abf94dc5c0801b333b434ba408952a1be45e3c58896204689bc62a8fde5605137ed6b69f7684f47a2834dc3d1e042bb00282501f2482434871acc92e084eddd8  plasma-phone-components-682.b79bb13.tar.gz"
+sha512sums="abf94dc5c0801b333b434ba408952a1be45e3c58896204689bc62a8fde5605137ed6b69f7684f47a2834dc3d1e042bb00282501f2482434871acc92e084eddd8  plasma-phone-components-682.b79bb13.tar.gz
+43046f7a0526986ca8453929c88bd1f05dfd255ba809d339a395935c7fb65ef562531a1770d3a0d7c07d6f3b9a3bbf9ea7791d12581f64d4b3dd0ccb83c945b5  plasma-phone-components.post-install
+43046f7a0526986ca8453929c88bd1f05dfd255ba809d339a395935c7fb65ef562531a1770d3a0d7c07d6f3b9a3bbf9ea7791d12581f64d4b3dd0ccb83c945b5  plasma-phone-components.post-upgrade
+43046f7a0526986ca8453929c88bd1f05dfd255ba809d339a395935c7fb65ef562531a1770d3a0d7c07d6f3b9a3bbf9ea7791d12581f64d4b3dd0ccb83c945b5  plasma-phone-components.post-deinstall"
diff --git a/pmb/qemu/run.py b/pmb/qemu/run.py
index ce0d1497..9e9c36a3 100644
--- a/pmb/qemu/run.py
+++ b/pmb/qemu/run.py
@@ -18,6 +18,7 @@ along with pmbootstrap.  If not, see <http://www.gnu.org/licenses/>.
 """
 import logging
 import os
+import shutil
 
 import pmb.build
 import pmb.chroot
@@ -48,13 +49,12 @@ def system_image(args, device):
 
 def which_qemu(args, arch):
     """
-    Finds the qemu executable or raises and exception otherwise
+    Finds the qemu executable or raises an exception otherwise
     """
     executable = "qemu-system-" + arch
-    try:
-        pmb.helpers.run.user(args, ["which", executable])
+    if shutil.which(executable):
         return executable
-    except RuntimeError:
+    else:
         raise RuntimeError("Could not find the '" + executable + "' executable"
                            " in your PATH. Please install it in order to"
                            " run qemu.")