Bug 899292 - Exception constructing environment when topobjdir isn't available; r=glandium

--HG--
extra : rebase_source : a920d5c87d112338259c0401c4cb29ed228cfa4c
This commit is contained in:
Gregory Szorc 2013-07-30 09:39:54 -07:00
parent ca8d01b9c5
commit 8b11dbaf71

View File

@ -163,7 +163,9 @@ class MozbuildObject(ProcessExecutionMixin):
raise ObjdirMismatchException(topobjdir, config['topobjdir'])
topobjdir = os.path.normpath(config['topobjdir'] or topobjdir)
topobjdir = config['topobjdir'] or topobjdir
if topobjdir:
topobjdir = os.path.normpath(topobjdir)
# If we can't resolve topobjdir, oh well. The constructor will figure
# it out via config.guess.