diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-21 19:55:00 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-21 19:55:00 +0300 |
commit | b6821dc590906b540c51417261235d0f1ea1c08c (patch) | |
tree | 3b2919709283c87f94fd42b7b167573e4dde12de | |
parent | 2cbd917cf63cc1b031135d178d0f40abd4ee5675 (diff) | |
parent | e7d5b9dd8e006f533fc6480e8e6fa3a78164bdd1 (diff) | |
download | meson-b6821dc590906b540c51417261235d0f1ea1c08c.tar.gz |
Merge pull request #2352 from LukeShu/minor-fixups
Minor fixups
-rwxr-xr-x | ghwt.py | 5 | ||||
-rwxr-xr-x | meson.py | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | mesonbuild/rewriter.py | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | msi/License.rtf | 0 |
4 files changed, 6 insertions, 1 deletions
@@ -14,6 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +# ghwt - GitHub WrapTool +# +# An emergency wraptool(1) replacement downloader that downloads +# directly from GitHub in case wrapdb.mesonbuild.com is down. + import urllib.request, json, sys, os, shutil, subprocess import configparser, hashlib @@ -24,7 +24,7 @@ def main(): # encoding, so we can just warn about it. e = locale.getpreferredencoding() if e.upper() != 'UTF-8' and not mesonlib.is_windows(): - print('Warning: You are using {!r} which is not a a Unicode-compatible ' + print('Warning: You are using {!r} which is not a Unicode-compatible ' 'locale.'.format(e), file=sys.stderr) print('You might see errors if you use UTF-8 strings as ' 'filenames, as strings, or as file contents.', file=sys.stderr) diff --git a/mesonbuild/rewriter.py b/mesonbuild/rewriter.py index b88c5efe2..b88c5efe2 100755..100644 --- a/mesonbuild/rewriter.py +++ b/mesonbuild/rewriter.py diff --git a/msi/License.rtf b/msi/License.rtf index 9b58df930..9b58df930 100755..100644 --- a/msi/License.rtf +++ b/msi/License.rtf |