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

build fixes

Browse source
This commit is contained in:
Joey Hess 2019-12-18 14:36:19 -04:00
parent a94d804f63
commit 7d82b6911b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Build/DistributionUpdate.hs
View file

@ -133,7 +133,7 @@ makeinfos updated version = do
let infofile = f ++ ".info" let infofile = f ++ ".info"
let d = GitAnnexDistribution let d = GitAnnexDistribution
{ distributionUrl = mkUrl f { distributionUrl = mkUrl f
, distributionKey = mkKey (const k) , distributionKey = keyData k
, distributionVersion = bv , distributionVersion = bv
, distributionReleasedate = now , distributionReleasedate = now
, distributionUrgentUpgrade = Just "6.20180626" , distributionUrgentUpgrade = Just "6.20180626"
@ -222,10 +222,10 @@ buildrpms :: FilePath -> [(FilePath, Version)] -> Annex ()
buildrpms topdir l = do buildrpms topdir l = do
liftIO $ createDirectoryIfMissing True rpmrepo liftIO $ createDirectoryIfMissing True rpmrepo
oldrpms <- map (rpmrepo </>) . filter (".rpm" `isSuffixOf`) oldrpms <- map (rpmrepo </>) . filter (".rpm" `isSuffixOf`)
<$> getDirectoryContents rpmrepo <$> liftIO (getDirectoryContents rpmrepo)
forM_ tarrpmarches $ \(tararch, rpmarch) -> forM_ tarrpmarches $ \(tararch, rpmarch) ->
forM_ (filter (isstandalonetarball tararch . fst) l) $ \(tarball, v) -> do forM_ (filter (isstandalonetarball tararch . fst) l) $ \(tarball, v) -> do
mapM_ nukeFile (filter ((tararch ++ ".rpm") `isSuffixOf`) oldrpms) liftIO $ mapM_ nukeFile (filter ((tararch ++ ".rpm") `isSuffixOf`) oldrpms)
void $ liftIO $ boolSystem script void $ liftIO $ boolSystem script
[ Param rpmarch [ Param rpmarch
, File tarball , File tarball