diff options
| author | alvarez86 <pauloaalvarez@gmail.com> | 2016-11-07 17:26:46 -0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-07 11:26:46 -0800 |
| commit | 87f07cdf3db9923b41ac23d27d8e017c8c57ecc3 (patch) | |
| tree | bc5038e7aa03d458cb2e2a55750edc9a5ab07d9a | |
| parent | 8d182e00c9dae45c8abe2df7e0c347fc5ce7deef (diff) | |
| download | meson-87f07cdf3db9923b41ac23d27d8e017c8c57ecc3.zip meson-87f07cdf3db9923b41ac23d27d8e017c8c57ecc3.tar.gz meson-87f07cdf3db9923b41ac23d27d8e017c8c57ecc3.tar.bz2 | |
Minor adjusts (#1001)
* contributing: Use should instead of thould
* interpreter: Use exist_ok parameter in subdir function
We explicitly depend on python 3.4 or newer, which means the exist_ok
parameter is available. Use it instead of a try with a pass on except.
* authors: Add my name at the end of authors file
| -rw-r--r-- | authors.txt | 1 | ||||
| -rw-r--r-- | contributing.txt | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 5 |
3 files changed, 3 insertions, 5 deletions
diff --git a/authors.txt b/authors.txt index f591d13..c2e8388 100644 --- a/authors.txt +++ b/authors.txt @@ -54,3 +54,4 @@ Alexandre Foley Jouni Kosonen Aurelien Jarno Mark Schulte +Paulo Antonio Alvarez diff --git a/contributing.txt b/contributing.txt index 7553ab0..cb71ca0 100644 --- a/contributing.txt +++ b/contributing.txt @@ -32,7 +32,7 @@ those are simple. External dependencies The goal of Meson is to be as easily usable as possible. The user -experience thould be "get Python3 and Ninja, run", even on +experience should be "get Python3 and Ninja, run", even on Windows. Unfortunately this means that we can't have dependencies on projects outside of Python's standard library. This applies only to core functionality, though. For additional helper programs etc the use diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 561cc19..0030660 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2177,10 +2177,7 @@ requirements use the version keyword argument instead.''') % subdir) self.visited_subdirs[subdir] = True self.subdir = subdir - try: - os.makedirs(os.path.join(self.environment.build_dir, subdir)) - except FileExistsError: - pass + os.makedirs(os.path.join(self.environment.build_dir, subdir), exist_ok=True) buildfilename = os.path.join(self.subdir, environment.build_filename) self.build_def_files.append(buildfilename) absname = os.path.join(self.environment.get_source_dir(), buildfilename) |