Skip to content

Commit c2c467e

Browse files
danbevMylesBorins
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 <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

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

configure

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,15 +1033,15 @@ def configure_intl(o):
10331033
if nodedownload.candownload(auto_downloads, "icu"):
10341034
nodedownload.retrievefile(url, targetfile)
10351035
else:
1036-
print(' Re-using existing %s' % targetfile)
1036+
print('Re-using existing %s' % targetfile)
10371037
if os.path.isfile(targetfile):
1038-
sys.stdout.write(' Checking file integrity with MD5:\r')
1038+
print('Checking file integrity with MD5:\r')
10391039
gotmd5 = nodedownload.md5sum(targetfile)
1040-
print(' MD5: %s %s' % (gotmd5, targetfile))
1040+
print('MD5: %s %s' % (gotmd5, targetfile))
10411041
if (md5 == gotmd5):
10421042
return targetfile
10431043
else:
1044-
print(' Expected: %s *MISMATCH*' % md5)
1044+
print('Expected: %s *MISMATCH*' % md5)
10451045
print('\n ** Corrupted ZIP? Delete %s to retry download.\n' % targetfile)
10461046
return None
10471047
icu_config = {
@@ -1179,7 +1179,7 @@ def configure_intl(o):
11791179
os.rename(tmp_icu, icu_full_path)
11801180
shutil.rmtree(icu_tmp_path)
11811181
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.' % \
11831183
with_icu_source)
11841184
shutil.rmtree(icu_tmp_path)
11851185
sys.exit(1)
@@ -1195,16 +1195,16 @@ def configure_intl(o):
11951195
if localzip:
11961196
nodedownload.unpack(localzip, icu_parent_path)
11971197
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" )')
12001200
sys.exit(1)
12011201
else:
12021202
print('* Using ICU in %s' % icu_full_path)
12031203
# Now, what version of ICU is it? We just need the "major", such as 54.
12041204
# uvernum.h contains it as a #define.
12051205
uvernum_h = os.path.join(icu_full_path, 'source/common/unicode/uvernum.h')
12061206
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)
12081208
sys.exit(1)
12091209
icu_ver_major = None
12101210
matchVerExp = r'^\s*#define\s+U_ICU_VERSION_SHORT\s+"([^"]*)".*'
@@ -1214,7 +1214,7 @@ def configure_intl(o):
12141214
if m:
12151215
icu_ver_major = m.group(1)
12161216
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)
12181218
sys.exit(1)
12191219
icu_endianness = sys.byteorder[0];
12201220
o['variables']['icu_ver_major'] = icu_ver_major
@@ -1241,8 +1241,8 @@ def configure_intl(o):
12411241
# this is the icudt*.dat file which node will be using (platform endianness)
12421242
o['variables']['icu_data_file'] = icu_data_file
12431243
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.')
12461246
# .. and we're not about to build it from .gyp!
12471247
sys.exit(1)
12481248
# map from variable name to subdirs

0 commit comments

Comments
 (0)