From 2762f9c4ce9d2b05e04523d469408afe3bea2975 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Sun, 23 Jun 2024 09:53:33 -0400
Subject: [PATCH] fix location log update for copy to 1-node cluster

---
 P2P/Proxy.hs                    | 22 +++++++++++-----------
 doc/todo/git-annex_proxies.mdwn |  4 ----
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/P2P/Proxy.hs b/P2P/Proxy.hs
index ec9ade8ba8..0ba3bfe290 100644
--- a/P2P/Proxy.hs
+++ b/P2P/Proxy.hs
@@ -303,16 +303,17 @@ proxy proxydone proxymethods servermode (ClientSide clientrunst clientconn) remo
 	handleGET remoteside message = getresponse (runRemoteSide remoteside) message $
 		withDATA (relayGET remoteside)
 
-	handlePUT (remoteside:[]) k message =
-		getresponse (runRemoteSide remoteside) message $ \resp -> case resp of
-			ALREADY_HAVE -> protoerrhandler proxynextclientmessage $
-				client $ net $ sendMessage resp
-			ALREADY_HAVE_PLUS _ -> protoerrhandler proxynextclientmessage $
-				client $ net $ sendMessage resp
-			PUT_FROM _ -> 
-				getresponse client resp $ 
-					withDATA (relayPUT remoteside k)
-			_ -> protoerr
+	handlePUT (remoteside:[]) k message
+		| remoteUUID remoteside == remoteuuid =
+			getresponse (runRemoteSide remoteside) message $ \resp -> case resp of
+				ALREADY_HAVE -> protoerrhandler proxynextclientmessage $
+					client $ net $ sendMessage resp
+				ALREADY_HAVE_PLUS _ -> protoerrhandler proxynextclientmessage $
+					client $ net $ sendMessage resp
+				PUT_FROM _ -> 
+					getresponse client resp $ 
+						withDATA (relayPUT remoteside k)
+				_ -> protoerr
 	handlePUT [] _ _ = 
 		protoerrhandler proxynextclientmessage $
 			client $ net $ sendMessage ALREADY_HAVE
@@ -474,7 +475,6 @@ proxy proxydone proxymethods servermode (ClientSide clientrunst clientconn) remo
 				client $ net $ sendMessage $
 					case concat (catMaybes storeduuids) of
 						[] -> FAILURE
-						(_u:[]) -> SUCCESS
 						us
 							| protocolversion < 2 -> SUCCESS
 							| otherwise -> SUCCESS_PLUS us
diff --git a/doc/todo/git-annex_proxies.mdwn b/doc/todo/git-annex_proxies.mdwn
index 3869f31ca6..d1f4ef5352 100644
--- a/doc/todo/git-annex_proxies.mdwn
+++ b/doc/todo/git-annex_proxies.mdwn
@@ -74,10 +74,6 @@ For June's work on [[design/passthrough_proxy]], implementation plan:
   check may fail to realize that dropping from multiple nodes does in fact
   make it worse.
 
-* Bug: When a cluster has one node, copying a file to it does not update
-  location log to say the content is present on it. It's returning SUCCESS
-  rather than SUCCESS-PLUS.
-
 * Support annex.jobs for clusters.
 
 * On upload to a cluster, as well as fanout to nodes, if the key is