1.2.6-2

3 files changed, 42 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c786550276ea..015f5e7e0129 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = python2-kitchen
 	pkgdesc = Kitchen contains a cornucopia of useful code
 	pkgver = 1.2.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/fedora-infra/kitchen
 	arch = any
 	license = LGPL
 	makedepends = python2-setuptools
 	depends = python2
 	source = python2-kitchen-1.2.6.tar.gz::https://github.com/fedora-infra/kitchen/archive/1.2.6.tar.gz
+	source = 0001-Insert-source_dir-before-other-directories-in-sys.pa.patch
 	sha256sums = 6963dd84819713aafdd55e5314dcce6df5a37430b62fd9c48770e9f1a467b2b0
+	sha256sums = 0a0f34332f2cbe16a0381a18b54ce902b0fa41393926c971fe03048903a764bd
 
 pkgname = python2-kitchen
 
diff --git a/0001-Insert-source_dir-before-other-directories-in-sys.pa.patch b/0001-Insert-source_dir-before-other-directories-in-sys.pa.patch
new file mode 100644
index 000000000000..6c8fc1f35b36
--- /dev/null
+++ b/0001-Insert-source_dir-before-other-directories-in-sys.pa.patch
@@ -0,0 +1,26 @@
+From 39d17d5cd071887cea7b89ce63244920ddce8c3a Mon Sep 17 00:00:00 2001
+From: 0x9fff00 <0x9fff00+git@protonmail.ch>
+Date: Sat, 25 May 2019 15:43:42 +0200
+Subject: [PATCH] Insert source_dir before other directories in sys.path
+
+Currently the site-packages directory is searched first when importing kitchen.release, which can cause issues if the installed version of kitchen is broken. To fix this, insert source_dir first in sys.path.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index e52e163..4de3370 100755
+--- a/setup.py
++++ b/setup.py
+@@ -43,7 +43,7 @@ elif sys.version_info[0] == 3:
+ else:
+     raise NotImplementedError("Python version unsupported %r" % sys.version)
+ 
+-sys.path.append(os.path.abspath(source_dir))
++sys.path.insert(1, os.path.abspath(source_dir))
+ 
+ # Now that we have modified sys.path, these imports will pull in either the py3
+ # version or the py2 version.
+-- 
+2.21.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 00ff6771ff7b..1377c26c38e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,15 +5,25 @@
 _name=kitchen
 pkgname=python2-$_name
 pkgver=1.2.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Kitchen contains a cornucopia of useful code'
 arch=('any')
 url="https://github.com/fedora-infra/$_name"
 license=('LGPL')
 depends=('python2')
 makedepends=('python2-setuptools')
-source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
-sha256sums=('6963dd84819713aafdd55e5314dcce6df5a37430b62fd9c48770e9f1a467b2b0')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
+        '0001-Insert-source_dir-before-other-directories-in-sys.pa.patch')
+sha256sums=('6963dd84819713aafdd55e5314dcce6df5a37430b62fd9c48770e9f1a467b2b0'
+            '0a0f34332f2cbe16a0381a18b54ce902b0fa41393926c971fe03048903a764bd')
+
+prepare() {
+  cd "$_name-$pkgver"
+
+  for p in "$srcdir"/*.patch; do
+    patch -Np1 -i "$p"
+  done
+}
 
 build() {
   cd "$_name-$pkgver"