[sagemath] 02/02: Set SYMPOW_CACHEDIR instead of HOME

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository sagemath.

commit f9f95c76224549b8220cf8c16dab8d4083857494
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Jan 6 18:12:19 2017 +0100

    Set SYMPOW_CACHEDIR instead of HOME
---
 debian/control.runtime-depends              | 2 +-
 debian/patches/series                       | 2 +-
 debian/patches/u2-fix-sympow-cachedir.patch | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/control.runtime-depends b/debian/control.runtime-depends
index fc3399d..2a16b56 100644
--- a/debian/control.runtime-depends
+++ b/debian/control.runtime-depends
@@ -111,5 +111,5 @@
  singular-doc (>= 1:4.0.3-p3+ds-2),
  singular-doc (<< 1:4.1),
  sqlite3,
- sympow,
+ sympow (>= 1.023-8),
  tachyon,
diff --git a/debian/patches/series b/debian/patches/series
index 494403f..0c5374a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,11 +28,11 @@ u2-fix-trivial-test-cases.patch
 u2-fix-less-trivial-test-cases.patch
 u2-fix-sympow-cachedir.patch
 u2-scripts-dir.patch
+u2-reproducible-docs.patch
 
 # Patch Sage to work with dependency Debian packages
 # These won't change even if Debian and Sage use the same version
 # Not suitable for upstreaming
-u2-reproducible-docs.patch
 d0-arb.patch
 d0-cython-sys-path.patch
 d0-gsl-cblas.patch
diff --git a/debian/patches/u2-fix-sympow-cachedir.patch b/debian/patches/u2-fix-sympow-cachedir.patch
index 7c635a4..c76971c 100644
--- a/debian/patches/u2-fix-sympow-cachedir.patch
+++ b/debian/patches/u2-fix-sympow-cachedir.patch
@@ -1,6 +1,5 @@
-Description: Have sympow store cache in DOT_SAGE
- If HOME doesn't exist then sympow fails because it can't create HOME/.sympow
- Ideally this should be fixed in sympow, by supporting a --cache-dir flag
+Description: Set SYMPOW_CACHEDIR to be inside DOT_SAGE
+ Otherwise tests fail in sbuild because sympow can't create HOME/.sympow
 Author: Ximin Luo <infinity0 at debian.org>
 Forwarded: TODO
 ---
@@ -20,7 +19,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          Used to call sympow with given args
          """
 -        cmd = 'sympow %s'%args
-+        cmd = 'env HOME="%s" sympow %s' % (DOT_SAGE, args)
++        cmd = 'env SYMPOW_CACHEDIR="%s/sympow///" sympow %s' % (DOT_SAGE, args)
          v = os.popen(cmd).read().strip()
          verbose(v, level=2)
          return v

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git