From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 4 Nov 2013 19:01:30 +0000 (+0100)
Subject: Don't override built-in 'dir'
X-Git-Tag: 0.1~224
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e2bcf4304d968074f123c6dbf5081cb855b8091d;p=fdroidserver.git

Don't override built-in 'dir'
---

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'