Fix bug where the include server would crash if the PATH environment

variable wasn't set.



git-svn-id: http://distcc.googlecode.com/svn/trunk@520 01de4be4-8c4a-0410-9132-4925637da917

1 files changed, 5 insertions, 1 deletions

diff --git a/include_server/compiler_defaults.py b/include_server/compiler_defaults.py
index 79e50cb..e606110 100755
--- a/include_server/compiler_defaults.py
+++ b/include_server/compiler_defaults.py
@@ -93,12 +93,16 @@ def _SystemSearchdirsGCC(compiler, language, canonical_lookup):
     # http://docs.freebsd.org/info/gcc/gcc.info.Environment_Variables.html,
     # or the "Environment Variables Affecting GCC" section of the gcc
     # info page.
+    if 'PATH' in os.environ:
+      trimmed_env = {'PATH': os.environ['PATH']}
+    else:
+      trimmed_env = {}
     p = subprocess.Popen(command,
                          shell=False,
                          stdin=None,
                          stdout=subprocess.PIPE,
                          stderr=subprocess.STDOUT,
-                         env={'PATH': os.environ['PATH']})
+                         env=trimmed_env)
     out = p.communicate()[0]
   except (IOError, OSError), why:
     raise NotCoveredError (