From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Thu, 4 Sep 2014 12:00:28 +0000 (+0300)
Subject: pq-rpm: better error message
X-Git-Tag: tizen/0.6.22-20150206~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a803d61fc03e875d4a804936c6649f58a26e0c6e;p=tools%2Fgit-buildpackage.git

pq-rpm: better error message

Change-Id: Iaadc614e9ed5df2e943eed71511559d0b76e0227
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---

diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py
index 6380ee2..ee076aa 100755
--- a/gbp/scripts/pq_rpm.py
+++ b/gbp/scripts/pq_rpm.py
@@ -384,7 +384,7 @@ def import_spec_patches(repo, options):
     # Create pq-branch
     if repo.has_branch(pq_branch) and not options.force:
         raise GbpError("Patch-queue branch '%s' already exists. "
-                       "Try 'rebase' instead." % pq_branch)
+                       "Try 'switch' instead." % pq_branch)
     try:
         if repo.get_branch() == pq_branch:
             repo.force_head(upstream_commit, hard=True)