add compute remote uuid to compute state url

Otherwise, two different compute remotes that happen to take the same
input would use the same compute state url. Which seems wrong.

diff --git a/Command/AddComputed.hs b/Command/AddComputed.hs
index 0d614a1fc0ff02d4b36b4324da0e7dfbb3ea26a6..7afd23a12988d5f2e53db1da38e4922db6e6ba21 100644 (file)
--- a/Command/AddComputed.hs
+++ b/Command/AddComputed.hs
@@ -147,7 +147,7 @@ perform o r program = do
                | otherwise = ingestwith $
                        ingestAdd' nullMeterUpdate (Just ld) (Just stateurlk)
          where
-               stateurl = Remote.Compute.computeStateUrl state outputfile
+               stateurl = Remote.Compute.computeStateUrl r state outputfile
                stateurlk = fromUrl stateurl Nothing True
                outputfile' = tmpdir </> outputfile
                ld = LockedDown ldc $ KeySource

diff --git a/Remote/Compute.hs b/Remote/Compute.hs
index 1157ac581d5775689a374bceac2d0f9de957f8c0..b6ba1dbf2e7eadb2df1cd6d974bee479e5e33aab 100644 (file)
--- a/Remote/Compute.hs
+++ b/Remote/Compute.hs
@@ -257,9 +257,9 @@ parseComputeState k b =
                in go c' rest
 
 {- A compute: url for a given output file of a computation. -}
-computeStateUrl :: ComputeState -> OsPath -> URLString
-computeStateUrl st p = 
-       "annex-compute:" ++ fromOsPath p ++ "?" 
+computeStateUrl :: Remote -> ComputeState -> OsPath -> URLString
+computeStateUrl r st p = 
+       "annex-compute:" ++ fromUUID (uuid r) ++ "/" ++ fromOsPath p ++ "?" 
                ++ decodeBS (formatComputeState' Nothing st')
   where
        -- Omit computeOutputs, so this gives the same result whether