commit ebd2c3843caf415ae1f13017cad344178ca80067
Author: Kacper Kornet <[email protected]>
Date: Sun Jun 2 21:05:43 2013 +0100
unset GIT_DIR and GIT_WORK_TREE at the beginning of tests
As the builder script sets this variables, the tests committed to
packages/mercurial instead of test repositories.
mercurial-clean-environment.patch | 15 +++++++++++++++
mercurial.spec | 2 ++
2 files changed, 17 insertions(+)
---
diff --git a/mercurial.spec b/mercurial.spec
index 6c81aea..a5d86ba 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -27,6 +27,7 @@ Source2: %{name}-%{webapp}.config
Source3: %{name}-%{webapp}-apache.config
Source4: %{name}-%{webapp}-httpd.config
Patch0: %{name}-doc.patch
+Patch1: %{name}-clean-environment.patch
URL: http://mercurial.selenic.com/
BuildRequires: gettext-devel
BuildRequires: python >= 1:2.4
@@ -112,6 +113,7 @@ hgk=
%prep
%setup -q
%patch0 -p1
+%patch1 -p0
install %{SOURCE1} hgext/gtools.py
%build
diff --git a/mercurial-clean-environment.patch
b/mercurial-clean-environment.patch
new file mode 100644
index 0000000..05fc48b
--- /dev/null
+++ b/mercurial-clean-environment.patch
@@ -0,0 +1,15 @@
+--- 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')
+
++ 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/e7776cbb4160cd4a71bbe074c2d30734c932f591
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
