| Index: third_party/scons/scons-local/SCons/Tool/dvipdf.py
|
| ===================================================================
|
| --- third_party/scons/scons-local/SCons/Tool/dvipdf.py (revision 7505)
|
| +++ third_party/scons/scons-local/SCons/Tool/dvipdf.py (working copy)
|
| @@ -31,7 +31,7 @@
|
| # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
| #
|
|
|
| -__revision__ = "src/engine/SCons/Tool/dvipdf.py 3603 2008/10/10 05:46:45 scons"
|
| +__revision__ = "src/engine/SCons/Tool/dvipdf.py 3842 2008/12/20 22:59:52 scons"
|
|
|
| import SCons.Action
|
| import SCons.Defaults
|
| @@ -39,7 +39,7 @@
|
| import SCons.Tool.tex
|
| import SCons.Util
|
|
|
| -_null = SCons.Tool.tex._Null
|
| +_null = SCons.Scanner.LaTeX._null
|
|
|
| def DviPdfPsFunction(XXXDviAction, target = None, source= None, env=None):
|
| """A builder for DVI files that sets the TEXPICTS environment
|
| @@ -50,18 +50,17 @@
|
| except AttributeError :
|
| abspath = ''
|
|
|
| - saved_env = {}
|
| - saved_env['TEXPICTS'] = SCons.Tool.tex.modify_env_var(env, 'TEXPICTS', abspath)
|
| + saved_env = SCons.Scanner.LaTeX.modify_env_var(env, 'TEXPICTS', abspath)
|
|
|
| result = XXXDviAction(target, source, env)
|
|
|
| - if saved_env['TEXPICTS'] is _null:
|
| + if saved_env is _null:
|
| try:
|
| del env['ENV']['TEXPICTS']
|
| except KeyError:
|
| pass # was never set
|
| else:
|
| - env['ENV']['TEXPICTS'] = saved_env['TEXPICTS']
|
| + env['ENV']['TEXPICTS'] = saved_env
|
|
|
| return result
|
|
|
|
|