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

Replace some hard-coded paths with os.path.join

Browse source
This commit is contained in:
Daniel Martí 2015-09-14 18:12:15 -07:00
parent 2c0be49124
commit 5cb47203b3
3 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/checkupdates.py
View file

@ -103,7 +103,7 @@ def check_tags(app, pattern):
build_dir = os.path.join('build', 'srclib', app['Repo'])
repotype = common.getsrclibvcs(app['Repo'])
else:
build_dir = os.path.join('build/', app['id'])
build_dir = os.path.join('build', app['id'])
repotype = app['Repo Type']
if repotype not in ('git', 'git-svn', 'hg', 'bzr'):
@ -187,7 +187,7 @@ def check_repomanifest(app, branch=None):
build_dir = os.path.join('build', 'srclib', app['Repo'])
repotype = common.getsrclibvcs(app['Repo'])
else:
build_dir = os.path.join('build/', app['id'])
build_dir = os.path.join('build', app['id'])
repotype = app['Repo Type']
# Set up vcs interface and make sure we have the latest code...
@ -250,7 +250,7 @@ def check_repotrunk(app, branch=None):
build_dir = os.path.join('build', 'srclib', app['Repo'])
repotype = common.getsrclibvcs(app['Repo'])
else:
build_dir = os.path.join('build/', app['id'])
build_dir = os.path.join('build', app['id'])
repotype = app['Repo Type']
if repotype not in ('git-svn', ):
@ -318,7 +318,7 @@ def check_changed_subdir(app):
if app['Repo Type'] == 'srclib':
build_dir = os.path.join('build', 'srclib', app['Repo'])
else:
build_dir = os.path.join('build/', app['id'])
build_dir = os.path.join('build', app['id'])
if not os.path.isdir(build_dir):
return None
@ -346,7 +346,7 @@ def fetch_autoname(app, tag):
if app['Repo Type'] == 'srclib':
app_dir = os.path.join('build', 'srclib', app['Repo'])
else:
app_dir = os.path.join('build/', app['id'])
app_dir = os.path.join('build', app['id'])
try:
vcs = common.getvcs(app["Repo Type"], app["Repo"], app_dir)