diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-30 22:17:36 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-30 22:17:36 +0000 |
| commit | 7ef735ae2811757a4883f1664fd5f8ab9773b477 (patch) | |
| tree | ee914997913fcda6b8dedd29089245056c18fedf /third_party/scons/scons-local/SCons/Tool/dvipdf.py | |
| parent | 08cfdbb67a38a68eeb2e6e5a6a32e84148aea39d (diff) | |
| download | chromium_src-7ef735ae2811757a4883f1664fd5f8ab9773b477.zip chromium_src-7ef735ae2811757a4883f1664fd5f8ab9773b477.tar.gz chromium_src-7ef735ae2811757a4883f1664fd5f8ab9773b477.tar.bz2 | |
Update to SCons 1.2.0.
Review URL: http://codereview.chromium.org/17024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/scons/scons-local/SCons/Tool/dvipdf.py')
| -rw-r--r-- | third_party/scons/scons-local/SCons/Tool/dvipdf.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/third_party/scons/scons-local/SCons/Tool/dvipdf.py b/third_party/scons/scons-local/SCons/Tool/dvipdf.py index 5c5d35c..821d125 100644 --- a/third_party/scons/scons-local/SCons/Tool/dvipdf.py +++ b/third_party/scons/scons-local/SCons/Tool/dvipdf.py @@ -31,7 +31,7 @@ selection method. # 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.pdf 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 @@ def DviPdfPsFunction(XXXDviAction, target = None, source= None, env=None): 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 |