diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2015-08-12 14:05:03 -0700 |
|---|---|---|
| committer | Tom Powell <zifnab@zifnab06.net> | 2015-10-08 15:14:59 -0700 |
| commit | 9129cb0eacd33e7718f7e4d0034af4750966508f (patch) | |
| tree | 38e73f7ed6e68748bd2cb42c2b8983b8dd9d6222 /tools/roomservice.py | |
| parent | 55b9b64a87d7e6c92b2d727158a57938171dfc6d (diff) | |
| download | build-9129cb0eacd33e7718f7e4d0034af4750966508f.zip build-9129cb0eacd33e7718f7e4d0034af4750966508f.tar.gz build-9129cb0eacd33e7718f7e4d0034af4750966508f.tar.bz2 | |
roomservice: use force-sync when adding projects with roomservice
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
(cherry picked from commit c85b14faf6e27754afe90618f2cfe237002978a0)
Diffstat (limited to 'tools/roomservice.py')
| -rwxr-xr-x | tools/roomservice.py | 4 |
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) |