diff --git a/Utility.hs b/Utility.hs index ab90c51608..338aca7a39 100644 --- a/Utility.hs +++ b/Utility.hs @@ -19,7 +19,6 @@ import System.IO import System.Cmd import System.Exit import System.Posix.Signals -import Data.Typeable import System.Posix.IO import Data.String.Utils import System.Path @@ -110,7 +109,7 @@ boolSystem command params = do r <- rawSystem command params case r of ExitSuccess -> return True - ExitFailure e -> if Just e == cast sigINT + ExitFailure e -> if toInteger e == toInteger sigINT then error $ command ++ "interrupted" else return False diff --git a/debian/changelog b/debian/changelog index c7297d1c3f..77e01482fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ git-annex (0.03) UNRELEASED; urgency=low * Fix support for file:// remotes. * Add --verbose + * Fix SIGINT handling. -- Joey Hess Thu, 28 Oct 2010 13:46:59 -0400 diff --git a/doc/bugs/scp_interrupt_to_background.mdwn b/doc/bugs/scp_interrupt_to_background.mdwn index 700c81c650..381f5cd736 100644 --- a/doc/bugs/scp_interrupt_to_background.mdwn +++ b/doc/bugs/scp_interrupt_to_background.mdwn @@ -1,2 +1,2 @@ When getting a file with scp, SIGINT is blocked, exposing the git -subcommand fork to background bug again. +subcommand fork to background bug again. [[done]]