From fb66841e9a471c9c18bc7fcd8c07f887b8e64e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 4 Nov 2018 16:29:28 +0100 Subject: [PATCH] python.pkgs.click: rebase fix-paths.patch --- .../python-modules/click/fix-paths.patch | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/click/fix-paths.patch b/pkgs/development/python-modules/click/fix-paths.patch index 04719871b76..b44a08e591e 100644 --- a/pkgs/development/python-modules/click/fix-paths.patch +++ b/pkgs/development/python-modules/click/fix-paths.patch @@ -1,11 +1,13 @@ ---- a/click/_unicodefun.py 2018-06-11 15:08:59.369358278 +0200 -+++ b/click/_unicodefun.py 2018-06-11 15:09:09.342325998 +0200 -@@ -60,7 +60,7 @@ - extra = '' +diff --git a/click/_unicodefun.py b/click/_unicodefun.py +index 620edff..85a3c98 100644 +--- a/click/_unicodefun.py ++++ b/click/_unicodefun.py +@@ -63,7 +63,7 @@ def _verify_python3_env(): if os.name == 'posix': import subprocess -- rv = subprocess.Popen(['locale', '-a'], stdout=subprocess.PIPE, -+ rv = subprocess.Popen(['@locale@', '-a'], stdout=subprocess.PIPE, - stderr=subprocess.PIPE).communicate()[0] - good_locales = set() - has_c_utf8 = False + try: +- rv = subprocess.Popen(['locale', '-a'], stdout=subprocess.PIPE, ++ rv = subprocess.Popen(['@locale@', '-a'], stdout=subprocess.PIPE, + stderr=subprocess.PIPE).communicate()[0] + except OSError: + rv = b''