mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 15:30:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't override built-in 'dir'

Browse source
This commit is contained in:
Daniel Martí 2013-11-04 20:01:30 +01:00
parent 429221f282
commit e2bcf4304d
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/init.py
View file

@ -104,12 +104,12 @@ def main():
aapt = os.path.join(d, 'aapt') aapt = os.path.join(d, 'aapt')
break break
if os.path.isfile(aapt): if os.path.isfile(aapt):
dir = os.path.basename(os.path.dirname(aapt)) dirname = os.path.basename(os.path.dirname(aapt))
if dir == 'build-tools': if dirname == 'build-tools':
# this is the old layout, before versioned build-tools # this is the old layout, before versioned build-tools
write_to_config('build_tools', '') write_to_config('build_tools', '')
else: else:
write_to_config('build_tools', dir) write_to_config('build_tools', dirname)
# track down where the Android NDK is # track down where the Android NDK is
ndk_path = '/opt/android-ndk' ndk_path = '/opt/android-ndk'