aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mesonbuild/build.py1
-rwxr-xr-xtools/dircondenser.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index b86c84d..ec6e1e6 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -960,7 +960,6 @@ You probably should put it in link_with instead.''')
raise InvalidArguments('Tried to mix cross built and native libraries in target {!r}'.format(self.name))
self.link_targets.append(t)
-
def link_whole(self, target):
for t in listify(target, unholder=True):
if not isinstance(t, StaticLibrary):
diff --git a/tools/dircondenser.py b/tools/dircondenser.py
index c87b967..58c44a2 100755
--- a/tools/dircondenser.py
+++ b/tools/dircondenser.py
@@ -67,7 +67,7 @@ def condense(dirname):
i = _i + 1
if e[0] != i:
old_name = str(e[0]) + ' ' + e[1]
- new_name = str(i) + ' ' + e[1]
+ new_name = str(i) + ' ' + e[1]
#print('git mv "%s" "%s"' % (old_name, new_name))
subprocess.check_call(['git', 'mv', old_name, new_name])
replacements.append((old_name, new_name))