diff options
| author | Ernie Hershey <ernie.hershey@10gen.com> | 2013-10-23 13:20:23 -0400 |
|---|---|---|
| committer | Ernie Hershey <ernie.hershey@10gen.com> | 2013-10-23 13:20:23 -0400 |
| commit | 08adb27c9e9c3d48ba6a66f6cea98ba72965d5df (patch) | |
| tree | 0fd2113c7abd47642aefe1910c3269308f44c082 /src/mongo/installer | |
| parent | 667ea0bdbd3ec255820f9318383d4ae6c7c10a59 (diff) | |
| download | mongo-08adb27c9e9c3d48ba6a66f6cea98ba72965d5df.tar.gz | |
SERVER-10830 Don't break on nonexistant MSI related environment variables
Diffstat (limited to 'src/mongo/installer')
| -rw-r--r-- | src/mongo/installer/msi/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript index 9237bb5c874..73b4bb80130 100644 --- a/src/mongo/installer/msi/SConscript +++ b/src/mongo/installer/msi/SConscript @@ -12,13 +12,13 @@ Import("s3push") driverIncludeSource = "$BUILD_DIR/msi/DriverInclude.wxs" env = env.Clone() -env['WIX'] = os.environ['WIX'] +env['WIX'] = os.environ.get('WIX') env['WIXPATH'] = r'$WIX\bin' env['WIXHEAT'] = r'$WIXPATH\heat.exe' env['WIXCANDLE'] = r'$WIXPATH\candle.exe' env['WIXLIGHT'] = r'$WIXPATH\light.exe' env['WIXUIEXT'] = r'$WIXPATH\WixUIExtension.dll' -env['MERGEMODULESBASEPATH'] = os.environ['MERGEMODULESBASEPATH'] +env['MERGEMODULESBASEPATH'] = os.environ.get('MERGEMODULESBASEPATH') sources = [ driverIncludeSource, "wxs/BinaryFragment.wxs", |