Skip to content

Commit b495b6a

Browse files
danbevitaloacasas
authored andcommitted
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 <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: mhdawson - Michael Dawson <[email protected]> Reviewed-By: Richard Lau <[email protected]>
1 parent f60b455 commit b495b6a

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

configure

+11-11
Original file line numberDiff line numberDiff line change
@@ -1045,15 +1045,15 @@ def configure_intl(o):
10451045
if nodedownload.candownload(auto_downloads, "icu"):
10461046
nodedownload.retrievefile(url, targetfile)
10471047
else:
1048-
print(' Re-using existing %s' % targetfile)
1048+
print('Re-using existing %s' % targetfile)
10491049
if os.path.isfile(targetfile):
1050-
sys.stdout.write(' Checking file integrity with MD5:\r')
1050+
print('Checking file integrity with MD5:\r')
10511051
gotmd5 = nodedownload.md5sum(targetfile)
1052-
print(' MD5: %s %s' % (gotmd5, targetfile))
1052+
print('MD5: %s %s' % (gotmd5, targetfile))
10531053
if (md5 == gotmd5):
10541054
return targetfile
10551055
else:
1056-
print(' Expected: %s *MISMATCH*' % md5)
1056+
print('Expected: %s *MISMATCH*' % md5)
10571057
print('\n ** Corrupted ZIP? Delete %s to retry download.\n' % targetfile)
10581058
return None
10591059
icu_config = {
@@ -1191,7 +1191,7 @@ def configure_intl(o):
11911191
os.rename(tmp_icu, icu_full_path)
11921192
shutil.rmtree(icu_tmp_path)
11931193
else:
1194-
print(' Error: --with-icu-source=%s did not result in an "icu" dir.' % \
1194+
print('Error: --with-icu-source=%s did not result in an "icu" dir.' % \
11951195
with_icu_source)
11961196
shutil.rmtree(icu_tmp_path)
11971197
sys.exit(1)
@@ -1207,16 +1207,16 @@ def configure_intl(o):
12071207
if localzip:
12081208
nodedownload.unpack(localzip, icu_parent_path)
12091209
if not os.path.isdir(icu_full_path):
1210-
print(' Cannot build Intl without ICU in %s.' % icu_full_path)
1211-
print(' (Fix, or disable with "--with-intl=none" )')
1210+
print('Cannot build Intl without ICU in %s.' % icu_full_path)
1211+
print('(Fix, or disable with "--with-intl=none" )')
12121212
sys.exit(1)
12131213
else:
12141214
print('* Using ICU in %s' % icu_full_path)
12151215
# Now, what version of ICU is it? We just need the "major", such as 54.
12161216
# uvernum.h contains it as a #define.
12171217
uvernum_h = os.path.join(icu_full_path, 'source/common/unicode/uvernum.h')
12181218
if not os.path.isfile(uvernum_h):
1219-
print(' Error: could not load %s - is ICU installed?' % uvernum_h)
1219+
print('Error: could not load %s - is ICU installed?' % uvernum_h)
12201220
sys.exit(1)
12211221
icu_ver_major = None
12221222
matchVerExp = r'^\s*#define\s+U_ICU_VERSION_SHORT\s+"([^"]*)".*'
@@ -1226,7 +1226,7 @@ def configure_intl(o):
12261226
if m:
12271227
icu_ver_major = m.group(1)
12281228
if not icu_ver_major:
1229-
print(' Could not read U_ICU_VERSION_SHORT version from %s' % uvernum_h)
1229+
print('Could not read U_ICU_VERSION_SHORT version from %s' % uvernum_h)
12301230
sys.exit(1)
12311231
icu_endianness = sys.byteorder[0];
12321232
o['variables']['icu_ver_major'] = icu_ver_major
@@ -1253,8 +1253,8 @@ def configure_intl(o):
12531253
# this is the icudt*.dat file which node will be using (platform endianness)
12541254
o['variables']['icu_data_file'] = icu_data_file
12551255
if not os.path.isfile(icu_data_path):
1256-
print(' Error: ICU prebuilt data file %s does not exist.' % icu_data_path)
1257-
print(' See the README.md.')
1256+
print('Error: ICU prebuilt data file %s does not exist.' % icu_data_path)
1257+
print('See the README.md.')
12581258
# .. and we're not about to build it from .gyp!
12591259
sys.exit(1)
12601260
# map from variable name to subdirs

0 commit comments

Comments
 (0)