buildpackage: Handle Ctrl-C more gracefully

9 files changed, 27 insertions, 5 deletions

diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index ced5348..4090287 100755
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -767,6 +767,9 @@ def main(argv):
                                    'GBP_BRANCH': branch or '(no branch)',
                                    'GBP_SHA1': sha})
                      )()
+    except KeyboardInterrupt:
+        retval = 1
+        gbp.log.err("Interrupted. Aborting.")
     except CommandExecFailed:
         retval = 1
     except (GbpError, GitRepositoryError) as err:
diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py
index 00582df..6f52a82 100644
--- a/gbp/scripts/buildpackage_rpm.py
+++ b/gbp/scripts/buildpackage_rpm.py
@@ -622,7 +622,9 @@ def main(argv):
                                    'GBP_SHA1': sha})()
         else:
             vcs_info = get_vcs_info(repo, tree)
-
+    except KeyboardInterrupt:
+        retval = 1
+        gbp.log.err("Interrupted. Aborting.")
     except CommandExecFailed:
         retval = 1
     except GitRepositoryError as err:
diff --git a/gbp/scripts/clone.py b/gbp/scripts/clone.py
index 1fda91f..af32211 100755
--- a/gbp/scripts/clone.py
+++ b/gbp/scripts/clone.py
@@ -119,7 +119,9 @@ def main(argv):
                         repo.create_branch(branch, remote)
 
         repo.set_branch(options.debian_branch)
-
+    except KeyboardInterrupt:
+        retval = 1
+        gbp.log.err("Interrupted. Aborting.")
     except GitRepositoryError as err:
         gbp.log.err("Git command failed: %s" % err)
         retval = 1
diff --git a/gbp/scripts/create_remote_repo.py b/gbp/scripts/create_remote_repo.py
index 539c18d..db60959 100644
--- a/gbp/scripts/create_remote_repo.py
+++ b/gbp/scripts/create_remote_repo.py
@@ -375,7 +375,9 @@ def main(argv):
             gbp.log.info("You can now add:")
             print_config(remote, branches)
             gbp.log.info("to your .git/config to 'gbp-pull' and 'git push' in the future.")
-
+    except KeyboardInterrupt:
+        retval = 1
+        gbp.log.err("Interrupted. Aborting.")
     except CommandExecFailed:
         retval = 1
     except (GbpError, GitRepositoryError) as err:
diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py
index 134fc3a..f0b4928 100644
--- a/gbp/scripts/dch.py
+++ b/gbp/scripts/dch.py
@@ -542,7 +542,9 @@ def main(argv):
             msg = changelog_commit_msg(options, version)
             repo.commit_files([changelog], msg)
             gbp.log.info("Changelog committed for version %s" % version)
-
+    except KeyboardInterrupt:
+        ret = 1
+        gbp.log.err("Interrupted. Aborting.")
     except (gbpc.CommandExecFailed,
             GbpError,
             GitRepositoryError,
diff --git a/gbp/scripts/import_dscs.py b/gbp/scripts/import_dscs.py
index ea1b610..7e049a9 100644
--- a/gbp/scripts/import_dscs.py
+++ b/gbp/scripts/import_dscs.py
@@ -154,7 +154,9 @@ def main(argv):
         for dsc in dscs[1:]:
             if importer.importdsc(dsc):
                 raise GbpError("Failed to import '%s'" % dscs[0].dscfile)
-
+    except KeyboardInterrupt:
+        ret = 1
+        gbp.log.err("Interrupted. Aborting.")
     except (GbpError, gbpc.CommandExecFailed, GitRepositoryError) as err:
         if str(err):
             gbp.log.err(err)
diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py
index 8f1f404..1d20ef9 100755
--- a/gbp/scripts/pq.py
+++ b/gbp/scripts/pq.py
@@ -418,6 +418,9 @@ def main(argv):
             apply_single_patch(repo, current, patch, maintainer, options.topic)
         elif action == "switch":
             switch_pq(repo, current)
+    except KeyboardInterrupt:
+        retval = 1
+        gbp.log.err("Interrupted. Aborting.")
     except CommandExecFailed:
         retval = 1
     except (GbpError, GitRepositoryError) as err:
diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py
index 1f0082a..b38427e 100755
--- a/gbp/scripts/pq_rpm.py
+++ b/gbp/scripts/pq_rpm.py
@@ -443,6 +443,9 @@ def main(argv):
             apply_single_patch(repo, current, patch, fallback_author=None)
         elif action == "switch":
             switch_pq(repo, current)
+    except KeyboardInterrupt:
+        retval = 1
+        gbp.log.err("Interrupted. Aborting.")
     except CommandExecFailed:
         retval = 1
     except GitRepositoryError as err:
diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py
index 67b2ab1..f019608 100755
--- a/gbp/scripts/pull.py
+++ b/gbp/scripts/pull.py
@@ -159,6 +159,9 @@ def main(argv):
             Command("gbp-pq")(["import"])
 
         repo.set_branch(current)
+    except KeyboardInterrupt:
+        retval = 1
+        gbp.log.err("Interrupted. Aborting.")
     except CommandExecFailed:
         retval = 1
     except (GbpError, GitRepositoryError) as err: