pq: don't drop the pq-branch while working on it.

Change-Id: Ie25f5529f1ebf9bc35d3b1355643717c40905997
Signed-off-by: wanchao-xu <wanchao.xu@samsung.com>

diff --git a/gbp/scripts/common/pq.py b/gbp/scripts/common/pq.py
index 32f73a5b692ec303b9ec7bec0e776069b97dceed..c5d1d5631ab49a166571b6b9a04e5bc2b383a3dd 100644 (file)
--- a/gbp/scripts/common/pq.py
+++ b/gbp/scripts/common/pq.py
@@ -412,8 +412,12 @@ def apply_and_commit_patch(repo, patch, fallback_author, topic=None, name=None):
 
 
 def drop_pq(repo, branch, pq_fmt=None, name_keys=None):
-    repo.checkout(pq_branch_base(branch, pq_fmt))
-    pq_branch = pq_branch_name(branch, pq_fmt, name_keys)
+    if is_pq_branch(branch, pq_fmt):
+        gbp.log.err("On a patch-queue branch, can't drop it.")
+        raise GbpError
+    else:
+        pq_branch = pq_branch_name(branch, pq_fmt, name_keys)
+
     if repo.has_branch(pq_branch):
         repo.delete_branch(pq_branch)
         gbp.log.info("Dropped branch '%s'." % pq_branch)