diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-22 14:59:01 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-22 14:59:01 -0400 |
| commit | 19978f265fd526d86764512f148d65bb01bac4a5 (patch) | |
| tree | 4bae000db1931c8a2d23d4210b41c01882476834 | |
| parent | cc768d4496cab118489833e1a12cfd714250bca6 (diff) | |
use .info, allow multiple info files in same directory
| -rw-r--r-- | Assistant/Threads/Upgrader.hs | 2 | ||||
| -rw-r--r-- | Build/DistributionUpdate.hs | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/Assistant/Threads/Upgrader.hs b/Assistant/Threads/Upgrader.hs index 86a42514d..8914a8bee 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 35851fa34..d3d144afa 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 |