From e47bff4bed91abbdd3a1ed094a5efee3a0f5ae46 Mon Sep 17 00:00:00 2001
From: Benjamin Drung <bdrung@ubuntu.com>
Date: Tue, 6 Sep 2011 13:24:25 +0200
Subject: [PATCH] requestsync: Do not crash on user abort (Closes: #637168).

---
 debian/changelog | 1 +
 requestsync      | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 30ec726..554de42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ ubuntu-dev-tools (0.129) UNRELEASED; urgency=low
 
   [ Benjamin Drung ]
   * sponsor-patch: Default to not upload the package.
+  * requestsync: Do not crash on user abort (Closes: #637168).
 
  -- Benjamin Drung <bdrung@debian.org>  Tue, 06 Sep 2011 13:14:50 +0200
 
diff --git a/requestsync b/requestsync
index 33a6462..37216f5 100755
--- a/requestsync
+++ b/requestsync
@@ -329,4 +329,8 @@ def main():
                 mailserver_user, mailserver_pass)
 
 if __name__ == '__main__':
-    main()
+    try:
+        main()
+    except KeyboardInterrupt:
+        print "\nUser abort."
+        sys.exit(2)