From e278bc65ca3bcdf7390e20233f15c8fba2760a06 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 10 Apr 2014 19:36:18 +0300 Subject: [PATCH] base16 encoding --- Handler/UploadStackage.hs | 4 ++-- stackage-server.cabal | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Handler/UploadStackage.hs b/Handler/UploadStackage.hs index 0256af3..542d8f0 100644 --- a/Handler/UploadStackage.hs +++ b/Handler/UploadStackage.hs @@ -6,7 +6,7 @@ import Crypto.Hash.Conduit (sinkHash) import Control.Monad.Catch (MonadCatch (..)) import Crypto.Hash (Digest, SHA1) import Data.Byteable (toBytes) -import qualified Data.ByteString.Base64.URL as B64 +import qualified Data.ByteString.Base16 as B16 import Yesod.Core.Types (HandlerT (HandlerT), unHandlerT) import Data.Conduit.Zlib (ungzip) import qualified Codec.Archive.Tar as Tar @@ -38,7 +38,7 @@ putUploadStackageR = do $$ getZipSink (ZipSink sinkHash <* ZipSink (ungzip =$ sinkHandle handleOut)) liftIO $ hClose handleOut let bs = toBytes (digest :: Digest SHA1) - ident = PackageSetIdent $ decodeUtf8 $ B64.encode bs + ident = PackageSetIdent $ decodeUtf8 $ B16.encode bs -- Check for duplicates mstackage <- runDB $ getBy $ UniqueStackage ident diff --git a/stackage-server.cabal b/stackage-server.cabal index eab3934..1fdb2ac 100644 --- a/stackage-server.cabal +++ b/stackage-server.cabal @@ -101,7 +101,7 @@ library , exceptions , byteable , cryptohash - , base64-bytestring + , base16-bytestring , zlib , esqueleto