summaryrefslogtreecommitdiff
path: root/gbp
diff options
context:
space:
mode:
Diffstat (limited to 'gbp')
-rwxr-xr-xgbp/scripts/pq.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py
index 0118c27..fbd59a7 100755
--- a/gbp/scripts/pq.py
+++ b/gbp/scripts/pq.py
@@ -131,7 +131,11 @@ def import_quilt_patches(repo, branch, series, tries, force):
tmpdir, series = safe_patches(series)
queue = PatchSeries.read_series_file(series)
+
+ i = len(commits)
for commit in commits:
+ if len(commits):
+ gbp.log.info("%d tries left" % i)
try:
gbp.log.info("Trying to apply patches at '%s'" % commit)
repo.create_branch(pq_branch, commit)
@@ -150,6 +154,7 @@ def import_quilt_patches(repo, branch, series, tries, force):
else:
# All patches applied successfully
break
+ i-=1
else:
raise GbpError("Couldn't apply patches")