www/firefox/files/patch-bug1288587

   1 diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
   2 index 855214a..1e91d51 100644
   3 --- build/moz.configure/init.configure
   4 +++ build/moz.configure/init.configure
   5 @@ -211,6 +211,7 @@ option(env='PYTHON', nargs=1, help='Python 2.7 interpr
   6  @imports(_from='mozbuild.virtualenv', _import='VirtualenvManager')
   7  @imports(_from='mozbuild.virtualenv', _import='verify_python_version')
   8  @imports(_from='mozbuild.virtualenv', _import='PY2')
   9 +@imports(_from='__builtin__', _import='KeyError')
  10  def virtualenv_python2(env_python, build_env, mozconfig, help):
  11      if help:
  12          return
  13 @@ -242,6 +243,12 @@ def virtualenv_python2(env_python, build_env, mozconfi
  14              python = mozconfig['vars']['added']['PYTHON']
  15          elif 'PYTHON' in mozconfig['vars']['modified']:
  16              python = mozconfig['vars']['modified']['PYTHON'][1]
  17 +        for i in ('env', 'vars'):
  18 +            for j in ('added', 'modified'):
  19 +                try:
  20 +                    del mozconfig[i][j]['PYTHON']
  21 +                except KeyError:
  22 +                    pass
  23
  24      log.debug("python2: executable from configuration: %r" % python)
  25
  26 @@ -294,7 +301,10 @@ def virtualenv_python2(env_python, build_env, mozconfi
  27                  sys.executable, manager.python_path))
  28              log.info('Reexecuting in the virtualenv')
  29              if env_python:
  30 -                del os.environ['PYTHON']
  31 +                try:
  32 +                    del os.environ['PYTHON']
  33 +                except KeyError:
  34 +                    pass
  35              # One would prefer to use os.execl, but that's completely borked on
  36              # Windows.
  37              sys.exit(subprocess.call([python] + sys.argv))
  38 @@ -430,6 +440,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre
  39  @imports(_from='mozbuild.virtualenv', _import='PY3')
  40  @imports(_from='mozbuild.pythonutil', _import='find_python3_executable')
  41  @imports(_from='mozbuild.pythonutil', _import='python_executable_version')
  42 +@imports(_from='__builtin__', _import='KeyError')
  43  def virtualenv_python3(env_python, build_env, mozillabuild, mozconfig, help):
  44      if help:
  45          return
  46 @@ -465,6 +476,12 @@ def virtualenv_python3(env_python, build_env, mozillab
  47              python = mozconfig['vars']['added']['PYTHON3']
  48          elif 'PYTHON3' in mozconfig['vars']['modified']:
  49              python = mozconfig['vars']['modified']['PYTHON3'][1]
  50 +        for i in ('env', 'vars'):
  51 +            for j in ('added', 'modified'):
  52 +                try:
  53 +                    del mozconfig[i][j]['PYTHON3']
  54 +                except KeyError:
  55 +                    pass
  56
  57      log.debug("python3: executable from configuration: %r" % python)
  58
  59 @@ -545,7 +562,10 @@ def virtualenv_python3(env_python, build_env, mozillab
  60                  sys.executable, manager.python_path))
  61              log.info('Re-executing in the virtualenv')
  62              if env_python:
  63 -                del os.environ['PYTHON3']
  64 +                try:
  65 +                    del os.environ['PYTHON3']
  66 +                except KeyError:
  67 +                    pass
  68              # One would prefer to use os.execl, but that's completely borked on
  69              # Windows.
  70              sys.exit(subprocess.call([python] + sys.argv))