client: Clarify error message when unlock is required

Adding/removing aliases and matches requires a place to be idle. The
error when message when not minding this, is misleading in these cases
where really the place needs to be unlocked before the specific
operation.

Mention that the specific operation needs the place be idle. Instruct
the user to unlock if it's acquired by them.

Signed-off-by: Jonas Rebmann <[email protected]>

Author: jonrebm

labgrid/remote/client.py

@@ -481,10 +481,11 @@ def get_place(self, place=None):
     def get_idle_place(self, place=None):
         place = self.get_place(place)
         if place.acquired:
-            _, user = place.acquired.split("/")
-            raise UserError(
-                f"place {place.name} is not idle (acquired by {place.acquired}). To work simultaneously, {user} can execute labgrid-client -p {place.name} allow {self.gethostname()}/{self.getuser()}"
-            )
+            err = "This operation requires the place to be idle."
+            if place.acquired == self.gethostname() + "/" + self.getuser():
+                raise UserError(f"{err} Please release {place.name}.")
+            else:
+                raise UserError(f"{err} Place {place.name} is acquired by {place.acquired}.")
         return place
 
     def get_acquired_place(self, place=None):
@@ -681,7 +682,21 @@ def check_matches(self, place):
 
     async def acquire(self):
         """Acquire a place, marking it unavailable for other clients"""
-        place = self.get_idle_place()
+        place = self.get_place()
+        if place.acquired:
+            host, user = place.acquired.split("/")
+            allowhelp = f"'labgrid-client -p {place.name} allow {self.gethostname()}/{self.getuser()}' on {host}."
+            if self.getuser() == user:
+                if self.gethostname() == host:
+                    raise UserError("You have already acquired this place.")
+                else:
+                    raise UserError(
+                        f"You have already acquired this place on {host}. To work simultaneously, execute {allowhelp}"
+                    )
+            else:
+                raise UserError(
+                    f"Place {place.name} is already acquired by {place.acquired}. To work simultaneously, {user} can execute {allowhelp}"
+                )
         if not self.args.allow_unmatched:
             self.check_matches(place)