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/mdist.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/mdist.py')
| -rw-r--r-- | mesonbuild/mdist.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/mdist.py b/mesonbuild/mdist.py index bfff50a..ea0583e 100644 --- a/mesonbuild/mdist.py +++ b/mesonbuild/mdist.py @@ -46,7 +46,7 @@ def create_hash(fname): m = hashlib.sha256() m.update(open(fname, 'rb').read()) with open(hashname, 'w') as f: - f.write('%s %s\n' % (m.hexdigest(), os.path.basename(fname))) + f.write('{} {}\n'.format(m.hexdigest(), os.path.basename(fname))) def del_gitfiles(dirname): @@ -195,7 +195,7 @@ def run_dist_steps(meson_command, unpacked_src_dir, builddir, installdir, ninja_ return 0 def check_dist(packagename, meson_command, extra_meson_args, bld_root, privdir): - print('Testing distribution package %s' % packagename) + print('Testing distribution package {}'.format(packagename)) unpackdir = os.path.join(privdir, 'dist-unpack') builddir = os.path.join(privdir, 'dist-build') installdir = os.path.join(privdir, 'dist-install') @@ -220,7 +220,7 @@ def check_dist(packagename, meson_command, extra_meson_args, bld_root, privdir): windows_proof_rmtree(unpackdir) windows_proof_rmtree(builddir) windows_proof_rmtree(installdir) - print('Distribution package %s tested' % packagename) + print('Distribution package {} tested'.format(packagename)) return ret def determine_archives_to_generate(options): |