diff options
| author | Michael Brockus <55331536+michaelbadcrumble@users.noreply.github.com> | 2020-03-03 11:45:43 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-03 21:45:43 +0200 |
| commit | 98ddd52ceddb29e1c4164de47bfb2448ee1ebffe (patch) | |
| tree | fdee8651ee8a1f8048fbe3d3c18bd9dad6488cc9 /mesonbuild/msubprojects.py | |
| parent | 21e543fea8ffd1a968f67e23a8a85f6c5e5dde54 (diff) | |
| download | meson-98ddd52ceddb29e1c4164de47bfb2448ee1ebffe.zip meson-98ddd52ceddb29e1c4164de47bfb2448ee1ebffe.tar.gz meson-98ddd52ceddb29e1c4164de47bfb2448ee1ebffe.tar.bz2 | |
Cherry-picking - (rm python2 % add python3 .format) (#6725)
Diffstat (limited to 'mesonbuild/msubprojects.py')
| -rwxr-xr-x | mesonbuild/msubprojects.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/msubprojects.py b/mesonbuild/msubprojects.py index b1c79b8..9a8b0cf 100755 --- a/mesonbuild/msubprojects.py +++ b/mesonbuild/msubprojects.py @@ -129,7 +129,7 @@ def update_svn(wrap, repo_dir, options): subprocess.check_call(['svn', 'update', '-r', revno], cwd=repo_dir) def update(wrap, repo_dir, options): - mlog.log('Updating %s...' % wrap.name) + mlog.log('Updating {}...'.format(wrap.name)) if wrap.type == 'file': update_file(wrap, repo_dir, options) elif wrap.type == 'git': @@ -148,7 +148,7 @@ def checkout(wrap, repo_dir, options): cmd = ['checkout', branch_name, '--'] if options.b: cmd.insert(1, '-b') - mlog.log('Checkout %s in %s...' % (branch_name, wrap.name)) + mlog.log('Checkout {} in {}...'.format(branch_name, wrap.name)) try: git_output(cmd, repo_dir) git_show(repo_dir) @@ -157,7 +157,7 @@ def checkout(wrap, repo_dir, options): mlog.log(' -> ', mlog.red(out)) def download(wrap, repo_dir, options): - mlog.log('Download %s...' % wrap.name) + mlog.log('Download {}...'.format(wrap.name)) if os.path.isdir(repo_dir): mlog.log(' -> Already downloaded') return @@ -169,7 +169,7 @@ def download(wrap, repo_dir, options): mlog.log(' ->', mlog.red(str(e))) def foreach(wrap, repo_dir, options): - mlog.log('Executing command in %s' % repo_dir) + mlog.log('Executing command in {}'.format(repo_dir)) if not os.path.isdir(repo_dir): mlog.log(' -> Not downloaded yet') return @@ -179,7 +179,7 @@ def foreach(wrap, repo_dir, options): cwd=repo_dir).decode() mlog.log(out, end='') except subprocess.CalledProcessError as e: - err_message = "Command '%s' returned non-zero exit status %d." % (" ".join(e.cmd), e.returncode) + err_message = "Command '{}' returned non-zero exit status {}.".format(" ".join(e.cmd), e.returncode) out = e.output.decode() mlog.log(' -> ', mlog.red(err_message)) mlog.log(out, end='') |