From 6a4efe8a82fbbaf49786c44886ccba2855c8fef2 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 18 Apr 2017 13:47:35 +1000 Subject: Drop terminating fullstop from "Installing blah to blah" messages Grammatically, this full stop isn't needed and with file names it has a potential to be confusing: Installing /foo/bar/filename.1 to /foo/bar/dirname. The full stop caused me to do a double-take more than once, so let's drop it. --- mesonbuild/scripts/gettext.py | 2 +- mesonbuild/scripts/meson_install.py | 8 ++++---- mesonbuild/scripts/yelphelper.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mesonbuild/scripts/gettext.py b/mesonbuild/scripts/gettext.py index 624790d..f8b538c 100644 --- a/mesonbuild/scripts/gettext.py +++ b/mesonbuild/scripts/gettext.py @@ -81,7 +81,7 @@ def do_install(src_sub, bld_sub, dest, pkgname, langs): os.makedirs(os.path.split(outfile)[0], exist_ok=True) shutil.copyfile(srcfile, outfile) shutil.copystat(srcfile, outfile) - print('Installing %s to %s.' % (srcfile, outfile)) + print('Installing %s to %s' % (srcfile, outfile)) return 0 def run(args): diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py index 2205f1a..fbcc2a4 100644 --- a/mesonbuild/scripts/meson_install.py +++ b/mesonbuild/scripts/meson_install.py @@ -133,7 +133,7 @@ def install_subdirs(data): if src_dir.endswith('/') or src_dir.endswith('\\'): src_dir = src_dir[:-1] src_prefix = os.path.join(src_dir, inst_dir) - print('Installing subdir %s to %s.' % (src_prefix, dst_dir)) + print('Installing subdir %s to %s' % (src_prefix, dst_dir)) dst_dir = get_destdir_path(data, dst_dir) if not os.path.exists(dst_dir): os.makedirs(dst_dir) @@ -148,7 +148,7 @@ def install_data(d): mode = i[2] outdir = os.path.split(outfilename)[0] os.makedirs(outdir, exist_ok=True) - print('Installing %s to %s.' % (fullfilename, outdir)) + print('Installing %s to %s' % (fullfilename, outdir)) do_copyfile(fullfilename, outfilename) set_mode(outfilename, mode) @@ -158,7 +158,7 @@ def install_man(d): outfilename = get_destdir_path(d, m[1]) outdir = os.path.split(outfilename)[0] os.makedirs(outdir, exist_ok=True) - print('Installing %s to %s.' % (full_source_filename, outdir)) + print('Installing %s to %s' % (full_source_filename, outdir)) if outfilename.endswith('.gz') and not full_source_filename.endswith('.gz'): with open(outfilename, 'wb') as of: with open(full_source_filename, 'rb') as sf: @@ -259,7 +259,7 @@ def install_targets(d): pdb_filename = os.path.splitext(fname)[0] + '.pdb' if not should_strip and os.path.exists(pdb_filename): pdb_outname = os.path.splitext(outname)[0] + '.pdb' - print('Installing pdb file %s to %s.' % (pdb_filename, pdb_outname)) + print('Installing pdb file %s to %s' % (pdb_filename, pdb_outname)) do_copyfile(pdb_filename, pdb_outname) elif os.path.isdir(fname): fname = os.path.join(d.build_dir, fname.rstrip('/')) diff --git a/mesonbuild/scripts/yelphelper.py b/mesonbuild/scripts/yelphelper.py index 85d89b8..47dfb71 100644 --- a/mesonbuild/scripts/yelphelper.py +++ b/mesonbuild/scripts/yelphelper.py @@ -65,7 +65,7 @@ def install_help(srcdir, blddir, sources, media, langs, install_dir, destdir, pr for source in sources: infile = os.path.join(srcdir if lang == 'C' else blddir, lang, source) outfile = os.path.join(indir, source) - mlog.log('Installing %s to %s.' % (infile, outfile)) + mlog.log('Installing %s to %s' % (infile, outfile)) shutil.copyfile(infile, outfile) shutil.copystat(infile, outfile) for m in media: @@ -81,7 +81,7 @@ def install_help(srcdir, blddir, sources, media, langs, install_dir, destdir, pr os.makedirs(os.path.dirname(outfile), exist_ok=True) os.symlink(srcfile, outfile) continue - mlog.log('Installing %s to %s.' % (infile, outfile)) + mlog.log('Installing %s to %s' % (infile, outfile)) if '/' in m or '\\' in m: os.makedirs(os.path.dirname(outfile), exist_ok=True) shutil.copyfile(infile, outfile) -- cgit v1.1