summaryrefslogtreecommitdiffstats
path: root/project.py
diff options
context:
space:
mode:
authorMarc Herbert <marc.herbert@intel.com>2016-10-27 12:58:26 -0700
committerMarc Herbert <marc.herbert@intel.com>2016-10-27 12:58:26 -0700
commitec287902e6517f0f7d11738f411d111c1ed06df1 (patch)
treeee4b3071c42e75bbd4dd955b9b1535bc15e5cd0b /project.py
parent4d5bb68d58f12885ea06fb73d5e17d8c780c9ff8 (diff)
downloadgit-repo-ec287902e6517f0f7d11738f411d111c1ed06df1.tar.gz
_CheckDirReference: log actual error before suggesting --force-sync
A recent backward incompatible change created confusion and loss of productivity and highlighted the very limited amount of information provided when repo sync fails; merely recommending to --force-sync and blow-up git repos without any hint as to why. The addition of this basic _error(...) call would have provided a clue and will in the future. BUG=Issue 232 TEST=simulate a breakage similar to the ones reported at https://groups.google.com/a/chromium.org/forum/#!topic/chromium-os-dev/2-0oCy_CX5s cd .repo/projects/src/third_party/libapps.git/ file info; rm info; ln -s wronglink info cd - repo sync src/third_party/libapps/ # error message now shows the failure Change-Id: Idd2f177a096f1ad686caa8c67cb361d594ccaa57
Diffstat (limited to 'project.py')
-rw-r--r--project.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/project.py b/project.py
index 29638ef7..bbb052a3 100644
--- a/project.py
+++ b/project.py
@@ -2400,6 +2400,7 @@ class Project(object):
2400 src = os.path.realpath(os.path.join(srcdir, name)) 2400 src = os.path.realpath(os.path.join(srcdir, name))
2401 # Fail if the links are pointing to the wrong place 2401 # Fail if the links are pointing to the wrong place
2402 if src != dst: 2402 if src != dst:
2403 _error('%s is different in %s vs %s', name, destdir, srcdir)
2403 raise GitError('--force-sync not enabled; cannot overwrite a local ' 2404 raise GitError('--force-sync not enabled; cannot overwrite a local '
2404 'work tree. If you\'re comfortable with the ' 2405 'work tree. If you\'re comfortable with the '
2405 'possibility of losing the work tree\'s git metadata,' 2406 'possibility of losing the work tree\'s git metadata,'