[debian-edu-commits] debian-edu/ 05/08: Add patch to merge TEXINPUTS.

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository sdaps.

commit 057bf250f1831f9d7eecdd90779af3ae2cd8c347
Author: Dominik George <nik at naturalnet.de>
Date:   Tue Jan 16 00:50:21 2018 +0100

    Add patch to merge TEXINPUTS.
---
 debian/patches/merge_texinputs.patch | 13 +++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 14 insertions(+)

diff --git a/debian/patches/merge_texinputs.patch b/debian/patches/merge_texinputs.patch
new file mode 100644
index 0000000..4615fbb
--- /dev/null
+++ b/debian/patches/merge_texinputs.patch
@@ -0,0 +1,13 @@
+From: Dominik George <nik at naturalnet.de>
+Subject: Merge potentially existing TEXINPUTS on pdflatex call
+--- a/sdaps/utils/latex.py
++++ b/sdaps/utils/latex.py
+@@ -110,7 +110,7 @@ def run_engine(texfile, cwd, inputs=None
+             defs.latex_preexec_hook()
+ 
+         if inputs:
+-            os.environ['TEXINPUTS'] = ':'.join(['.'] + inputs + [''])
++            os.environ['TEXINPUTS'] = ':'.join(['.'] + inputs + os.environ.get('TEXINPUTS', '').split(':') + [''])
+ 
+     subprocess.call([defs.latex_engine, '-halt-on-error',
+                      '-interaction', 'batchmode', texfile],
diff --git a/debian/patches/series b/debian/patches/series
index eab3587..b5ec18f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 remove_latex_copy.patch
+merge_texinputs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/sdaps.git