33 lines
1.6 KiB
Text
33 lines
1.6 KiB
Text
Index: src/mongo/SConscript
|
|
--- src/mongo/SConscript.orig
|
|
+++ src/mongo/SConscript
|
|
@@ -157,9 +157,9 @@ js_engine_ver = get_option("js-engine") if get_option(
|
|
|
|
# On windows, we need to escape the backslashes in the command-line
|
|
# so that windows paths look okay.
|
|
-cmd_line = " ".join(sys.argv).encode('string-escape')
|
|
+cmd_line = " ".join(sys.argv).encode('unicode_escape')
|
|
if env.TargetOSIs('windows'):
|
|
- cmd_line = cmd_line.replace('\\', r'\\')
|
|
+ cmd_line = cmd_line.replace(b'\\', b'\\')
|
|
|
|
module_list = '{ %s }' % ', '.join([ '"{0}"'.format(x) for x in env['MONGO_MODULES'] ])
|
|
|
|
@@ -613,7 +613,7 @@ env.Append(MODULE_BANNERS = [distsrc.File('README'),
|
|
distsrc.File('MPL-2')])
|
|
|
|
# If no module has introduced a file named LICENSE.txt, then inject the license.
|
|
-if sum(itertools.imap(lambda x: x.name == "LICENSE.txt", env['MODULE_BANNERS'])) == 0:
|
|
+if sum(map(lambda x: x.name == "LICENSE.txt", env['MODULE_BANNERS'])) == 0:
|
|
env.Append(MODULE_BANNERS = [distsrc.File('LICENSE-Community.txt')])
|
|
|
|
# All module banners get staged to the top level of the tarfile, so we
|
|
@@ -632,7 +632,7 @@ module_banner_transforms = ["--transform %s=$SERVER_DI
|
|
# Allow modules to map original file name directories to subdirectories
|
|
# within the archive (e.g. { "src/mongo/db/modules/enterprise/docs": "snmp"})
|
|
archive_addition_transforms = []
|
|
-for full_dir, archive_dir in env["ARCHIVE_ADDITION_DIR_MAP"].items():
|
|
+for full_dir, archive_dir in list(env["ARCHIVE_ADDITION_DIR_MAP"].items()):
|
|
archive_addition_transforms.append("--transform \"%s=$SERVER_DIST_BASENAME/%s\"" %
|
|
(full_dir, archive_dir))
|
|
|