mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Python string formatting

Browse Source
This commit is contained in:
cclauss 2018-05-03 07:47:34 +02:00
parent 60e5e213fd
commit d4a966c7c4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platforms/android/build_sdk.py
View File

@ -18,7 +18,7 @@ def execute(cmd, shell=False):
log.info('Executing: ' + ' '.join(cmd)) log.info('Executing: ' + ' '.join(cmd))
retcode = subprocess.call(cmd, shell=shell) retcode = subprocess.call(cmd, shell=shell)
if retcode < 0: if retcode < 0:
raise Fail("Child was terminated by signal:" %s -retcode) raise Fail("Child was terminated by signal: %s" % -retcode)
elif retcode > 0: elif retcode > 0:
raise Fail("Child returned: %s" % retcode) raise Fail("Child returned: %s" % retcode)
except OSError as e: except OSError as e:

6
platforms/js/build_js.py
View File

@ -14,7 +14,7 @@ def execute(cmd, shell=False):
log.info("Executing: %s" % cmd) log.info("Executing: %s" % cmd)
retcode = subprocess.call(cmd, shell=shell) retcode = subprocess.call(cmd, shell=shell)
if retcode < 0: if retcode < 0:
raise Fail("Child was terminated by signal:" %s -retcode) raise Fail("Child was terminated by signal: %s" % -retcode)
elif retcode > 0: elif retcode > 0:
raise Fail("Child returned: %s" % retcode) raise Fail("Child returned: %s" % retcode)
except OSError as e: except OSError as e:
@ -159,7 +159,7 @@ class Builder:
if flags: if flags:
cmd += ["-DCMAKE_C_FLAGS='%s'" % flags, cmd += ["-DCMAKE_C_FLAGS='%s'" % flags,
"-DCMAKE_CXX_FLAGS='%s'" % flags] "-DCMAKE_CXX_FLAGS='%s'" % flags]
return cmd; return cmd
def get_build_flags(self): def get_build_flags(self):
flags = "" flags = ""
@ -235,7 +235,7 @@ if __name__ == "__main__":
builder.config() builder.config()
if args.config_only: if args.config_only:
sys.exit(0); sys.exit(0)
log.info("=====") log.info("=====")
log.info("===== Building OpenCV.js in %s", "asm.js" if not args.build_wasm else "wasm") log.info("===== Building OpenCV.js in %s", "asm.js" if not args.build_wasm else "wasm")