From e2bcf4304d968074f123c6dbf5081cb855b8091d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Mon, 4 Nov 2013 20:01:30 +0100 Subject: [PATCH] Don't override built-in 'dir' --- fdroidserver/init.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fdroidserver/init.py b/fdroidserver/init.py index e6c42da4..6cfed4cd 100644 --- a/fdroidserver/init.py +++ b/fdroidserver/init.py @@ -104,12 +104,12 @@ def main(): aapt = os.path.join(d, 'aapt') break if os.path.isfile(aapt): - dir = os.path.basename(os.path.dirname(aapt)) - if dir == 'build-tools': + dirname = os.path.basename(os.path.dirname(aapt)) + if dirname == 'build-tools': # this is the old layout, before versioned build-tools write_to_config('build_tools', '') else: - write_to_config('build_tools', dir) + write_to_config('build_tools', dirname) # track down where the Android NDK is ndk_path = '/opt/android-ndk' -- 2.30.2