summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-10-29 12:38:41 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-10-29 12:38:41 -0400
commitfde01e52f382d7903749609301f99d78791c2f2c (patch)
tree223113c170be92aaaa8e0330f50c933297fbbb2c
parent694a33e91b290373649594688ad880203d140dcb (diff)
Fix SIGINT handling.
-rw-r--r--Utility.hs3
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/scp_interrupt_to_background.mdwn2
3 files changed, 3 insertions, 3 deletions
diff --git a/Utility.hs b/Utility.hs
index ab90c5160..338aca7a3 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 c7297d1c3..77e01482f 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 <joeyh@debian.org> 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 700c81c65..381f5cd73 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]]