diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-09-04 15:00:28 +0300 |
---|---|---|
committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-11-14 14:47:21 +0200 |
commit | a803d61fc03e875d4a804936c6649f58a26e0c6e (patch) | |
tree | 4a8eef63d9e2e8612bbe70a89e03219f952abce9 | |
parent | 8b0e0803f5a633d45c316410283f96f81e31de12 (diff) | |
download | git-buildpackage-a803d61fc03e875d4a804936c6649f58a26e0c6e.tar.gz git-buildpackage-a803d61fc03e875d4a804936c6649f58a26e0c6e.tar.bz2 git-buildpackage-a803d61fc03e875d4a804936c6649f58a26e0c6e.zip |
pq-rpm: better error message
Change-Id: Iaadc614e9ed5df2e943eed71511559d0b76e0227
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rwxr-xr-x | gbp/scripts/pq_rpm.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py index 6380ee22..ee076aa3 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) |