kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 14:30:11 +01:00
Code Activity

Fix more srclib-related stuff

Browse Source
This commit is contained in:
Ciaran Gultnieks 2013-06-05 12:54:47 +01:00
parent cfa2646b8f
commit 68df47779d
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdroidserver/build.py
View File

@ -676,17 +676,20 @@ def main():
# there are any.
if first:
if app['Repo Type'] == 'srclib':
build_dir = os.path.join('build', 'srclib')
build_dir = os.path.join('build', 'srclib', app['Repo'])
else:
build_dir = os.path.join('build', app['id'])
# Set up vcs interface and make sure we have the latest code...
if options.verbose:
print "Getting {0} vcs interface for {1}".format(
app['Repo Type'], app['Repo'])
vcs = common.getvcs(app['Repo Type'], app['Repo'], build_dir, sdk_path)
if app['Repo Type'] == 'srclib':
build_dir = os.path.join(build_dir, app['Repo'])
first = False
if options.verbose:
print "Checking " + thisbuild['version']
if trybuild(app, thisbuild, build_dir, output_dir, also_check_dir,
srclib_dir, extlib_dir, tmp_dir, repo_dir, vcs, options.test,
options.server, options.install, options.force,

12
fdroidserver/common.py
View File

@ -35,7 +35,9 @@ def getvcs(vcstype, remote, local, sdk_path):
if vcstype == 'bzr':
return vcs_bzr(remote, local, sdk_path)
if vcstype == 'srclib':
return getsrclib(remote, local, sdk_path, raw=True)
if local != 'build/srclib/' + remote:
raise VCSException("Error: srclib paths are hard-coded!")
return getsrclib(remote, 'build/srclib', sdk_path, raw=True)
raise VCSException("Invalid vcs type " + vcstype)
def getsrclibvcs(name):
@ -85,6 +87,7 @@ class vcs:
'.fdroidvcs-' + os.path.basename(self.local))
cdata = self.repotype() + ' ' + self.remote
writeback = True
deleterepo = False
if os.path.exists(self.local):
if os.path.exists(fdpath):
with open(fdpath, 'r') as f:
@ -92,8 +95,13 @@ class vcs:
if fsdata == cdata:
writeback = False
else:
deleterepo = True
print "*** Repository details changed - deleting ***"
shutil.rmtree(self.local)
else:
deleterepo = True
print "*** Repository details missing - deleting ***"
if deleterepo:
shutil.rmtree(self.local)
self.gotorevisionx(rev)