From ee554542c1f3ee63efe5533267cf9cd1e5c83d52 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 3 Jan 2012 00:29:27 -0400
Subject: after is a better name for observe_

---
 Remote/Git.hs   | 8 ++++----
 Remote/Rsync.hs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'Remote')

diff --git a/Remote/Git.hs b/Remote/Git.hs
index 2e32ca239..7d034d242 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -182,7 +182,7 @@ onLocal r a = do
 		-- No need to update the branch; its data is not used
 		-- for anything onLocal is used to do.
 		Annex.BranchState.disableUpdate
-		observe_ (liftIO Git.Command.reap) a
+		liftIO Git.Command.reap `after` a
 
 keyUrls :: Git.Repo -> Key -> [String]
 keyUrls r key = map tourl (annexLocations key)
@@ -217,9 +217,9 @@ copyToRemote r key
 		-- run copy from perspective of remote
 		liftIO $ onLocal r $ do
 			ensureInitialized
-			observe_ Annex.Content.saveState $
-				Annex.Content.getViaTmp key $
-					rsyncOrCopyFile params keysrc
+			Annex.Content.saveState `after`
+				Annex.Content.getViaTmp key
+					(rsyncOrCopyFile params keysrc)
 	| Git.repoIsSsh r = do
 		keysrc <- inRepo $ gitAnnexLocation key
 		rsyncHelper =<< rsyncParamsRemote r False key keysrc
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs
index 1461b96cd..c7b60467c 100644
--- a/Remote/Rsync.hs
+++ b/Remote/Rsync.hs
@@ -172,7 +172,7 @@ withRsyncScratchDir a = do
 	let tmp = t </> "rsynctmp" </> show pid
 	nuke tmp
 	liftIO $ createDirectoryIfMissing True tmp
-	observe_ (nuke tmp) (a tmp)
+	nuke tmp `after` a tmp
 	where
 		nuke d = liftIO $ 
 			doesDirectoryExist d >>? removeDirectoryRecursive d
-- 
cgit v1.2.3