Improve error message when LockError is raised

iterative · Nov 13, 2019 · 7f12ef8 · 7f12ef8
1 parent c1bbd8d
commit 7f12ef8
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/dvc/lock.py b/dvc/lock.py
@@ -6,6 +6,7 @@
 import time
 from datetime import timedelta
 
+import colorama
 from funcy.py3 import lkeep
 
 from dvc.exceptions import DvcException
@@ -73,7 +74,11 @@ def lock(self):
             except flufl.lock.TimeOutError:
                 raise LockError(
                     "cannot perform the cmd since DVC is busy and "
-                    "locked. Please retry the cmd later."
+                    "locked. You can delete .dvc/lock to fix it, but first "
+                    "please make sure there's no other dvc process ongoing "
+                    "by running: {blue}`ps xaf | grep dvc`{nc}.".format(
+                        blue=colorama.Back.BLUE, nc=colorama.Back.RESET
+                    )
                 )
 
         def _set_claimfile(self, pid=None):
@@ -121,7 +126,11 @@ def _do_lock(self):
             except zc.lockfile.LockError:
                 raise LockError(
                     "cannot perform the cmd since DVC is busy and "
-                    "locked. Please retry the cmd later."
+                    "locked. You can delete .dvc/lock to fix it, but first "
+                    "please make sure there's no other dvc process ongoing "
+                    "by running: {blue}`ps xaf | grep dvc`{nc}.".format(
+                        blue=colorama.Back.BLUE, nc=colorama.Back.RESET
+                    )
                 )
 
         def lock(self):