projects
/
tools
/
git-buildpackage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5223ef0
)
pq-rpm: better error message
author
Markus Lehtonen
<markus.lehtonen@linux.intel.com>
Thu, 4 Sep 2014 12:00:28 +0000
(15:00 +0300)
committer
Jun Wang
<junbill.wang@samsung.com>
Wed, 27 Jan 2016 17:29:40 +0000
(
01:29
+0800)
Change-Id: Iaadc614e9ed5df2e943eed71511559d0b76e0227
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
gbp/scripts/pq_rpm.py
patch
|
blob
|
history
diff --git
a/gbp/scripts/pq_rpm.py
b/gbp/scripts/pq_rpm.py
index
9ba5028
..
2f4f42c
100755
(executable)
--- a/
gbp/scripts/pq_rpm.py
+++ b/
gbp/scripts/pq_rpm.py
@@
-419,7
+419,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)