Commit c2c467e
build: make configure print statements consistent
I noticed that few of the print statements in configure have a leading
space with is not consistent with the rest of the file. Not sure if
this intentional or not so creating this commit just to bring it up
just in case.
PR-URL: #12176
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: mhdawson - Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>1 parent 811ccdf commit c2c467e
1 file changed
Lines changed: 11 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1033,15 +1033,15 @@ def configure_intl(o): | |||
| 1033 | 1033 | if nodedownload.candownload(auto_downloads, "icu"): | |
| 1034 | 1034 | nodedownload.retrievefile(url, targetfile) | |
| 1035 | 1035 | else: | |
| 1036 | - print(' Re-using existing %s' % targetfile) | ||
| 1036 | + print('Re-using existing %s' % targetfile) | ||
| 1037 | 1037 | if os.path.isfile(targetfile): | |
| 1038 | - sys.stdout.write(' Checking file integrity with MD5:\r') | ||
| 1038 | + print('Checking file integrity with MD5:\r') | ||
| 1039 | 1039 | gotmd5 = nodedownload.md5sum(targetfile) | |
| 1040 | - print(' MD5: %s %s' % (gotmd5, targetfile)) | ||
| 1040 | + print('MD5: %s %s' % (gotmd5, targetfile)) | ||
| 1041 | 1041 | if (md5 == gotmd5): | |
| 1042 | 1042 | return targetfile | |
| 1043 | 1043 | else: | |
| 1044 | - print(' Expected: %s *MISMATCH*' % md5) | ||
| 1044 | + print('Expected: %s *MISMATCH*' % md5) | ||
| 1045 | 1045 | print('\n ** Corrupted ZIP? Delete %s to retry download.\n' % targetfile) | |
| 1046 | 1046 | return None | |
| 1047 | 1047 | icu_config = { | |
@@ -1179,7 +1179,7 @@ def configure_intl(o): | |||
| 1179 | 1179 | os.rename(tmp_icu, icu_full_path) | |
| 1180 | 1180 | shutil.rmtree(icu_tmp_path) | |
| 1181 | 1181 | else: | |
| 1182 | - print(' Error: --with-icu-source=%s did not result in an "icu" dir.' % \ | ||
| 1182 | + print('Error: --with-icu-source=%s did not result in an "icu" dir.' % \ | ||
| 1183 | 1183 | with_icu_source) | |
| 1184 | 1184 | shutil.rmtree(icu_tmp_path) | |
| 1185 | 1185 | sys.exit(1) | |
@@ -1195,16 +1195,16 @@ def configure_intl(o): | |||
| 1195 | 1195 | if localzip: | |
| 1196 | 1196 | nodedownload.unpack(localzip, icu_parent_path) | |
| 1197 | 1197 | if not os.path.isdir(icu_full_path): | |
| 1198 | - print(' Cannot build Intl without ICU in %s.' % icu_full_path) | ||
| 1199 | - print(' (Fix, or disable with "--with-intl=none" )') | ||
| 1198 | + print('Cannot build Intl without ICU in %s.' % icu_full_path) | ||
| 1199 | + print('(Fix, or disable with "--with-intl=none" )') | ||
| 1200 | 1200 | sys.exit(1) | |
| 1201 | 1201 | else: | |
| 1202 | 1202 | print('* Using ICU in %s' % icu_full_path) | |
| 1203 | 1203 | # Now, what version of ICU is it? We just need the "major", such as 54. | |
| 1204 | 1204 | # uvernum.h contains it as a #define. | |
| 1205 | 1205 | uvernum_h = os.path.join(icu_full_path, 'source/common/unicode/uvernum.h') | |
| 1206 | 1206 | if not os.path.isfile(uvernum_h): | |
| 1207 | - print(' Error: could not load %s - is ICU installed?' % uvernum_h) | ||
| 1207 | + print('Error: could not load %s - is ICU installed?' % uvernum_h) | ||
| 1208 | 1208 | sys.exit(1) | |
| 1209 | 1209 | icu_ver_major = None | |
| 1210 | 1210 | matchVerExp = r'^\s*#define\s+U_ICU_VERSION_SHORT\s+"([^"]*)".*' | |
@@ -1214,7 +1214,7 @@ def configure_intl(o): | |||
| 1214 | 1214 | if m: | |
| 1215 | 1215 | icu_ver_major = m.group(1) | |
| 1216 | 1216 | if not icu_ver_major: | |
| 1217 | - print(' Could not read U_ICU_VERSION_SHORT version from %s' % uvernum_h) | ||
| 1217 | + print('Could not read U_ICU_VERSION_SHORT version from %s' % uvernum_h) | ||
| 1218 | 1218 | sys.exit(1) | |
| 1219 | 1219 | icu_endianness = sys.byteorder[0]; | |
| 1220 | 1220 | o['variables']['icu_ver_major'] = icu_ver_major | |
@@ -1241,8 +1241,8 @@ def configure_intl(o): | |||
| 1241 | 1241 | # this is the icudt*.dat file which node will be using (platform endianness) | |
| 1242 | 1242 | o['variables']['icu_data_file'] = icu_data_file | |
| 1243 | 1243 | if not os.path.isfile(icu_data_path): | |
| 1244 | - print(' Error: ICU prebuilt data file %s does not exist.' % icu_data_path) | ||
| 1245 | - print(' See the README.md.') | ||
| 1244 | + print('Error: ICU prebuilt data file %s does not exist.' % icu_data_path) | ||
| 1245 | + print('See the README.md.') | ||
| 1246 | 1246 | # .. and we're not about to build it from .gyp! | |
| 1247 | 1247 | sys.exit(1) | |
| 1248 | 1248 | # map from variable name to subdirs | |
0 commit comments