From 3f85d851bbf0985f22d3e6f993c38b3bf4647d0c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 22 Nov 2013 14:59:01 -0400
Subject: [PATCH] use .info, allow multiple info files in same directory

---
 Assistant/Threads/Upgrader.hs | 2 +-
 Build/DistributionUpdate.hs   | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Assistant/Threads/Upgrader.hs b/Assistant/Threads/Upgrader.hs
index 86a42514d9..8914a8bee9 100644
--- a/Assistant/Threads/Upgrader.hs
+++ b/Assistant/Threads/Upgrader.hs
@@ -84,4 +84,4 @@ getDistributionInfo = do
 			)
 
 distributionInfoUrl :: String
-distributionInfoUrl = fromJust Build.SysConfig.upgradelocation ++ "/info"
+distributionInfoUrl = fromJust Build.SysConfig.upgradelocation ++ ".info"
diff --git a/Build/DistributionUpdate.hs b/Build/DistributionUpdate.hs
index 35851fa344..d3d144afa1 100644
--- a/Build/DistributionUpdate.hs
+++ b/Build/DistributionUpdate.hs
@@ -32,11 +32,7 @@ makeinfos = do
 			Nothing -> noop
 			Just (k, _b) -> whenM (inAnnex k) $ do
 				liftIO $ putStrLn f
-				{- The info file is in the same directory
-				 - as the annex release bundle file. This
-				 - relies on each such file being in its
-				 - own directory. -}
-				let infofile = (dropFileName f </> "info")
+				let infofile = f ++ ".info"
 				liftIO $ writeFile infofile $ show $ GitAnnexDistribution
 					{ distributionUrl = mkUrl basedir f
 					, distributionKey = k