-
Notifications
You must be signed in to change notification settings - Fork 30.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix py errors #7620
Fix py errors #7620
Conversation
@@ -697,7 +697,7 @@ def Execute(args, context, timeout=None, env={}, faketty=False): | |||
|
|||
|
|||
def ExecuteNoCapture(args, context, timeout=None): | |||
(process, exit_code, timed_out) = RunProcess( | |||
(process, exit_code, timed_out, _) = RunProcess( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This function is basically dead code. I'd be alright with removing it and the code path leading up to it (the if not options.no_build:
statement in Main().)
LGTM with CI and with or without @bnoordhuis’ suggestion |
As the `no-build` and `build-only` options are not used anymore, they can be safely removed.
The format specifier is incomplete and without this the program will fail at runtime, with "incomplete format" error.
75ee865
to
6060be1
Compare
@bnoordhuis I removed the |
LGTM |
As the `no-build` and `build-only` options are not used anymore, they can be safely removed. PR-URL: #7620 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
The format specifier is incomplete and without this the program will fail at runtime, with "incomplete format" error. PR-URL: #7620 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
As the `no-build` and `build-only` options are not used anymore, they can be safely removed. PR-URL: #7620 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
The format specifier is incomplete and without this the program will fail at runtime, with "incomplete format" error. PR-URL: #7620 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@@ -33,7 +33,7 @@ | |||
shutil.rmtree(options.icusmall) | |||
|
|||
if not os.path.isdir(options.icusrc): | |||
print 'Missing source ICU dir --icusrc=%' % (options.icusrc) | |||
print 'Missing source ICU dir --icusrc=%s' % (options.icusrc) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oops - missed this. thanks! +1
@thefourtheye setting as don't land on v4.x please feel free to send backport if it should be |
Checklist
make -j4 test
(UNIX), orvcbuild test nosign
(Windows) passesAffected core subsystem(s)
tools
Description of change
There are two fixes.
RunProcess
function returns four values, but it is unpacked overthree variables and this will fail at runtime. This patch unpacks the
fourth value on a dummy variable. -
tools/test.py
fail at runtime, with "incomplete format" error. -
tools/icu/shrink-icu-src.py
cc @bnoordhuis @addaleax @jasnell