[arch-commits] Commit in thefuck/trunk (PKGBUILD psutil-3.patch)
Date: Tuesday, July 7, 2015 @ 16:36:29
Author: fyan
Revision: 136515
upgpkg: thefuck 1.47-1
Modified:
thefuck/trunk/PKGBUILD
Deleted:
thefuck/trunk/psutil-3.patch
+
PKGBUILD | 13 -
psutil-3.patch | 33 -
2 files changed, 4 insertions(+), 42 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-07 11:24:05 UTC (rev 136514)
+++ PKGBUILD2015-07-07 14:36:29 UTC (rev 136515)
@@ -2,8 +2,8 @@
# Maintainer: Felix Yan felixonm...@archlinux.org
pkgname=thefuck
-pkgver=1.46
-pkgrel=2
+pkgver=1.47
+pkgrel=1
pkgdesc=Magnificent app which corrects your previous console command
arch=('any')
url=https://github.com/nvbn/thefuck;
@@ -11,17 +11,12 @@
depends=('python-setuptools' 'python-psutil' 'python-six' 'python-colorama')
makedepends=('git')
checkdepends=('python-pytest-mock' 'python-mock')
-source=(git+https://github.com/nvbn/thefuck.git#tag=$pkgver;
-psutil-3.patch)
-sha256sums=('SKIP'
-'cc6d7c5569f46171b89686d4b6dc885a20d03386681add15e40bf9f4d00c4933')
+source=(git+https://github.com/nvbn/thefuck.git#tag=$pkgver;)
+sha256sums=('SKIP')
prepare() {
# pathlib is standard library since Python 3.4
sed -i s|install_requires=\['pathlib',|install_requires=[| thefuck/setup.py
-
- cd thefuck
- patch -p1 -i ../psutil-3.patch
}
build() {
Deleted: psutil-3.patch
===
--- psutil-3.patch 2015-07-07 11:24:05 UTC (rev 136514)
+++ psutil-3.patch 2015-07-07 14:36:29 UTC (rev 136515)
@@ -1,33 +0,0 @@
-From 6a88cc47b61656dc81fe527c2b9be91b125cc11e Mon Sep 17 00:00:00 2001
-From: Pablo Santiago Blum de Aguiar scorp...@gmail.com
-Date: Mon, 15 Jun 2015 09:20:07 -0300
-Subject: [PATCH] =?UTF-8?q?fix(main.wait=5Foutput):=20use=20Process?=
- =?UTF-8?q?=E2=80=99=20children()=20instead=20of=20get=5Fchildren()?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since psutil 2.0.0 `get_children()` has become deprecated and the use of
-`children()` instead of it has been encouraged. In version 3.0.0, just
-released, `get_children()` has been dropped. Check:
-
-https://github.com/giampaolo/psutil/blob/master/HISTORY.rst
-
-Fix #255
- thefuck/main.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/thefuck/main.py b/thefuck/main.py
-index 5772d4e..eebb668 100644
a/thefuck/main.py
-+++ b/thefuck/main.py
-@@ -62,7 +62,7 @@ def wait_output(settings, popen):
- proc.wait(settings.wait_command)
- return True
- except TimeoutExpired:
--for child in proc.get_children(recursive=True):
-+for child in proc.children(recursive=True):
- child.kill()
- proc.kill()
- return False
[arch-commits] Commit in thefuck/trunk (PKGBUILD psutil-3.patch)
Date: Wednesday, July 1, 2015 @ 09:14:47
Author: fyan
Revision: 136188
upgpkg: thefuck 1.46-2
add a patch to fix https://github.com/nvbn/thefuck/issues/255
Added:
thefuck/trunk/psutil-3.patch
Modified:
thefuck/trunk/PKGBUILD
+
PKGBUILD | 11 ---
psutil-3.patch | 33 +
2 files changed, 41 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-01 07:12:03 UTC (rev 136187)
+++ PKGBUILD2015-07-01 07:14:47 UTC (rev 136188)
@@ -3,7 +3,7 @@
pkgname=thefuck
pkgver=1.46
-pkgrel=1
+pkgrel=2
pkgdesc=Magnificent app which corrects your previous console command
arch=('any')
url=https://github.com/nvbn/thefuck;
@@ -12,12 +12,17 @@
makedepends=('git')
checkdepends=('python-pytest-mock' 'python-mock')
install=thefuck.install
-source=(git+https://github.com/nvbn/thefuck.git#tag=$pkgver;)
-sha256sums=('SKIP')
+source=(git+https://github.com/nvbn/thefuck.git#tag=$pkgver;
+psutil-3.patch)
+sha256sums=('SKIP'
+'cc6d7c5569f46171b89686d4b6dc885a20d03386681add15e40bf9f4d00c4933')
prepare() {
# pathlib is standard library since Python 3.4
sed -i s|install_requires=\['pathlib',|install_requires=[| thefuck/setup.py
+
+ cd thefuck
+ patch -p1 -i ../psutil-3.patch
}
build() {
Added: psutil-3.patch
===
--- psutil-3.patch (rev 0)
+++ psutil-3.patch 2015-07-01 07:14:47 UTC (rev 136188)
@@ -0,0 +1,33 @@
+From 6a88cc47b61656dc81fe527c2b9be91b125cc11e Mon Sep 17 00:00:00 2001
+From: Pablo Santiago Blum de Aguiar scorp...@gmail.com
+Date: Mon, 15 Jun 2015 09:20:07 -0300
+Subject: [PATCH] =?UTF-8?q?fix(main.wait=5Foutput):=20use=20Process?=
+ =?UTF-8?q?=E2=80=99=20children()=20instead=20of=20get=5Fchildren()?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Since psutil 2.0.0 `get_children()` has become deprecated and the use of
+`children()` instead of it has been encouraged. In version 3.0.0, just
+released, `get_children()` has been dropped. Check:
+
+https://github.com/giampaolo/psutil/blob/master/HISTORY.rst
+
+Fix #255
+---
+ thefuck/main.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/thefuck/main.py b/thefuck/main.py
+index 5772d4e..eebb668 100644
+--- a/thefuck/main.py
b/thefuck/main.py
+@@ -62,7 +62,7 @@ def wait_output(settings, popen):
+ proc.wait(settings.wait_command)
+ return True
+ except TimeoutExpired:
+-for child in proc.get_children(recursive=True):
++for child in proc.children(recursive=True):
+ child.kill()
+ proc.kill()
+ return False
