aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrint E. Kriebel <bekit@cyngn.com>2015-08-12 21:05:03 (GMT)
committerBrint E. Kriebel <bekit@cyngn.com>2015-08-12 21:20:54 (GMT)
commit38169b9ef4aa59481a2b46cea5ec87ede02c6f35 (patch)
tree3955055feaf36fa19e8592f82f6628faf105e11a
parente43e164e37583b332b729236ab5396cc4e3af040 (diff)
downloadandroid_build-cm-12.0.zip
android_build-cm-12.0.tar.gz
android_build-cm-12.0.tar.bz2
roomservice: use force-sync when adding projects with roomservicecm-12.0refs/changes/30/3330/1
This works around the error GitError: --force-sync not enabled; cannot overwrite a local work tree when using roomservice. Since this should only trigger when the device repos haven't been checked out yet, we can use force-sync to overwrite any roomservice device paths in the .repo directory. Change-Id: Iac54a8a2f2913f82f8ca6497b8785a9d5769640b Ticket: CYNGNOS-735
-rwxr-xr-xtools/roomservice.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/roomservice.py b/tools/roomservice.py
index f349634..01a7154 100755
--- a/tools/roomservice.py
+++ b/tools/roomservice.py
@@ -223,7 +223,7 @@ def fetch_dependencies(repo_path, fallback_branch = None):
if len(syncable_repos) > 0:
print('Syncing dependencies')
- os.system('repo sync %s' % ' '.join(syncable_repos))
+ os.system('repo sync --force-sync %s' % ' '.join(syncable_repos))
for deprepo in syncable_repos:
fetch_dependencies(deprepo)
@@ -285,7 +285,7 @@ else:
add_to_manifest([adding], fallback_branch)
print("Syncing repository to retrieve project.")
- os.system('repo sync %s' % repo_path)
+ os.system('repo sync --force-sync %s' % repo_path)
print("Repository synced!")
fetch_dependencies(repo_path, fallback_branch)