debian 3.65 → 3.65.1

raw patch · 3 files changed

+6/−9 lines, 3 filesdep ~process-extras

Dependency ranges changed: process-extras

Files

• Debian/Deb.hs +2/−3
• Debian/URI.hs +2/−4
• debian.cabal +2/−2

@@ -6,8 +6,7 @@ import Data.ByteString.Lazy (empty) import Debian.Control.Common import System.Exit (ExitCode(..))-import System.Process (CmdSpec(RawCommand))-import System.Process.Read (readProcessWithExitCode)+import System.Process (CmdSpec(RawCommand), readProcessWithExitCode) import System.Unix.Directory (withTemporaryDirectory, withWorkingDirectory) import System.Unix.FilePath (realpath) @@ -20,7 +19,7 @@               when (res /= ExitSuccess) (error $ "Dpkg.fields: " ++ show out ++ "\n" ++ show err ++ "\n" ++ show res)               (res, out, err) <- readProcessWithExitCode "tar" ["xzf", "control.tar.gz", "./control"] empty               when (res /= ExitSuccess) (error $ "Dpkg.fields: " ++ show out ++ "\n" ++ show err ++ "\n" ++ show res)-              c <- parseControlFromFile "control" +              c <- parseControlFromFile "control"               case c of                 Left e -> error (show e)                 (Right c) -> return c -- I don't think we need seq because parsec will force everything from the file

@@ -15,9 +15,7 @@ import Data.Maybe (catMaybes) import Network.URI import System.Directory (getDirectoryContents)-import System.Process.Read (readProcessWithExitCode)--- import System.Unix.LazyProcess (collectStdout)--- import System.Unix.Progress (lazyCommandF)+import System.Process.ByteString (readProcessWithExitCode) import Text.Regex (mkRegex, matchRegex)  uriToString' :: URI -> String@@ -29,7 +27,7 @@ fileFromURI :: URI -> IO (Either SomeException L.ByteString) fileFromURI uri = fileFromURIStrict uri >>= either (return . Left) (return . Right . L.fromChunks . (: [])) -fileFromURIStrict :: URI -> IO (Either SomeException B.ByteString)+fileFromURIStrict :: URI -> IO (Either SomeException L.ByteString) fileFromURIStrict uri = try $     case (uriScheme uri, uriAuthority uri) of       ("file:", Nothing) -> B.readFile (uriPath uri)

@@ -1,5 +1,5 @@ Name:           debian-Version:        3.65+Version:        3.65.1 License:        BSD3 License-File:   debian/copyright Author:         David Fox <dsf@seereason.com>, Jeremy Shaw <jeremy@seereason.com>, Clifford Beshers <beshers@seereason.com>@@ -36,7 +36,7 @@    pretty,    pretty-class,    process,-   process-extras >= 0.4,+   process-extras,    pureMD5,    regex-compat,    regex-tdfa,