mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

use .info, allow multiple info files in same directory

Browse source
This commit is contained in:
Joey Hess 2013-11-22 14:59:01 -04:00
parent 3a5baf2d48
commit 3f85d851bb
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assistant/Threads/Upgrader.hs
View file

@ -84,4 +84,4 @@ getDistributionInfo = do
) )
distributionInfoUrl :: String distributionInfoUrl :: String
distributionInfoUrl = fromJust Build.SysConfig.upgradelocation ++ "/info" distributionInfoUrl = fromJust Build.SysConfig.upgradelocation ++ ".info"

6
Build/DistributionUpdate.hs
View file

@ -32,11 +32,7 @@ makeinfos = do
Nothing -> noop Nothing -> noop
Just (k, _b) -> whenM (inAnnex k) $ do Just (k, _b) -> whenM (inAnnex k) $ do
liftIO $ putStrLn f liftIO $ putStrLn f
{- The info file is in the same directory let infofile = f ++ ".info"
- as the annex release bundle file. This
- relies on each such file being in its
- own directory. -}
let infofile = (dropFileName f </> "info")
liftIO $ writeFile infofile $ show $ GitAnnexDistribution liftIO $ writeFile infofile $ show $ GitAnnexDistribution
{ distributionUrl = mkUrl basedir f { distributionUrl = mkUrl basedir f
, distributionKey = k , distributionKey = k