| 1 |
commit: c7c3868c74a2ebc8f2c69a60389f0451e544bd34 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Thu Sep 23 17:40:23 2021 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 23 19:00:29 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7c3868c |
| 7 |
|
| 8 |
dev-vcs/git-cola: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/22375 |
| 11 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
| 12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/git-cola-3.5-py3.8-line-buffering.patch | 29 ---------------------- |
| 16 |
1 file changed, 29 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch b/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 4938d6a30ec..00000000000 |
| 21 |
--- a/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,29 +0,0 @@ |
| 24 |
-From ed00653d43b00b18e89c8c4d9e733ef156c02579 Mon Sep 17 00:00:00 2001 |
| 25 |
-From: Simon Peeters <peeters.simon@×××××.com> |
| 26 |
-Date: Mon, 18 Nov 2019 21:15:32 +0100 |
| 27 |
-Subject: [PATCH] Only use line buffering in text mode when calling Popen |
| 28 |
- |
| 29 |
-Python3.8 started complaining loudly when trying to open a stream in binary mode but with line buffering enabled. |
| 30 |
-So we should only try to set `bufsize` to `1` when we enable `text` or `universal_newlines` mode. |
| 31 |
- |
| 32 |
-see https://docs.python.org/3/library/subprocess.html#subprocess.Popen under bufsize |
| 33 |
---- |
| 34 |
- cola/core.py | 5 ++++- |
| 35 |
- 1 file changed, 4 insertions(+), 1 deletion(-) |
| 36 |
- |
| 37 |
-diff --git a/cola/core.py b/cola/core.py |
| 38 |
-index 0fabfcf3d..5ad719f05 100644 |
| 39 |
---- a/cola/core.py |
| 40 |
-+++ b/cola/core.py |
| 41 |
-@@ -208,7 +208,10 @@ def start_command(cmd, cwd=None, add_env=None, |
| 42 |
- CREATE_NO_WINDOW = 0x08000000 |
| 43 |
- extra['creationflags'] = CREATE_NO_WINDOW |
| 44 |
- |
| 45 |
-- return subprocess.Popen(cmd, bufsize=1, stdin=stdin, stdout=stdout, |
| 46 |
-+ # Use line buffering when in text/universal_newlines mode, |
| 47 |
-+ # otherwise use the system default buffer size. |
| 48 |
-+ bufsize = 1 if universal_newlines else -1 |
| 49 |
-+ return subprocess.Popen(cmd, bufsize=bufsize, stdin=stdin, stdout=stdout, |
| 50 |
- stderr=stderr, cwd=cwd, env=env, |
| 51 |
- universal_newlines=universal_newlines, **extra) |
| 52 |
- |
Archives