[packages/mercurial] updated clean environment patch

[atler]

commit 8f5c1a24c3a565d01c0edf4c418ef87a1a0911ea
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat May 1 12:09:34 2021 +0200

    updated clean environment patch

 mercurial-clean-environment.patch | 24 ++++++++++--------------
 mercurial.spec                    |  2 +-
 2 files changed, 11 insertions(+), 15 deletions(-)
---
diff --git a/mercurial.spec b/mercurial.spec
index 666ad5f..2be67e3 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -122,7 +122,7 @@ hgk=
 %prep
 %setup -q
 
-%patch1 -p0
+%patch1 -p1
 
 # fails on builders due to lack of networking
 %{__rm} tests/test-clonebundles.t
diff --git a/mercurial-clean-environment.patch b/mercurial-clean-environment.patch
index 05fc48b..161f694 100644
--- a/mercurial-clean-environment.patch
+++ b/mercurial-clean-environment.patch
@@ -1,15 +1,11 @@
---- tests/run-tests.py~	2013-05-15 00:43:40.000000000 +0100
-+++ tests/run-tests.py	2013-06-02 19:51:26.913166446 +0100
-@@ -1186,6 +1186,12 @@
-     DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
-     HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
+--- mercurial-4.7/tests/run-tests.py.orig	2021-05-01 12:05:44.155689095 +0200
++++ mercurial-4.7/tests/run-tests.py	2021-05-01 12:08:54.234281616 +0200
+@@ -1095,7 +1095,7 @@
+ 
+         for k in ('HG HGPROF CDPATH GREP_OPTIONS http_proxy no_proxy ' +
+                   'HGPLAIN HGPLAINEXCEPT EDITOR VISUAL PAGER ' +
+-                  'NO_PROXY CHGDEBUG').split():
++                  'NO_PROXY CHGDEBUG GIT_DIR GIT_WORK_TREE').split():
+             if k in env:
+                 del env[k]
  
-+    try:
-+       del os.environ['GIT_DIR']
-+       del os.environ['GIT_WORK_TREE']
-+    except KeyError:
-+       pass
-+
-     try:
-         if INST:
-             installhg(options)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mercurial.git/commitdiff/0826ecfdc7c63f0e8cd4849be910da5dc1aa92c7