From 7d82b6911b2c3299a8d1d44e093a154e7fff61fd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 18 Dec 2019 14:36:19 -0400 Subject: [PATCH] build fixes --- Build/DistributionUpdate.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Build/DistributionUpdate.hs b/Build/DistributionUpdate.hs index d3e498736f..ce2211cf39 100644 --- a/Build/DistributionUpdate.hs +++ b/Build/DistributionUpdate.hs @@ -133,7 +133,7 @@ makeinfos updated version = do let infofile = f ++ ".info" let d = GitAnnexDistribution { distributionUrl = mkUrl f - , distributionKey = mkKey (const k) + , distributionKey = keyData k , distributionVersion = bv , distributionReleasedate = now , distributionUrgentUpgrade = Just "6.20180626" @@ -222,10 +222,10 @@ buildrpms :: FilePath -> [(FilePath, Version)] -> Annex () buildrpms topdir l = do liftIO $ createDirectoryIfMissing True rpmrepo oldrpms <- map (rpmrepo ) . filter (".rpm" `isSuffixOf`) - <$> getDirectoryContents rpmrepo + <$> liftIO (getDirectoryContents rpmrepo) forM_ tarrpmarches $ \(tararch, rpmarch) -> 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 [ Param rpmarch , File tarball