summaryrefslogtreecommitdiff
path: root/quilt/patches/return2
diff options
context:
space:
mode:
Diffstat (limited to 'quilt/patches/return2')
-rw-r--r--quilt/patches/return258
1 files changed, 58 insertions, 0 deletions
diff --git a/quilt/patches/return2 b/quilt/patches/return2
new file mode 100644
index 0000000..9aa364f
--- /dev/null
+++ b/quilt/patches/return2
@@ -0,0 +1,58 @@
+ * Make sure that quilt returns 2 when there is nothing to do so that
+ patchsys-quilt.mk works again. Upstream regression since 0.33.
+ (Closes: #358792).
+
+Upstream status: Submitted 060427
+
+---
+ quilt/push.in | 2 +-
+ quilt/scripts/patchfns.in | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/quilt/push.in
++++ b/quilt/push.in
+@@ -362,7 +362,7 @@ else
+ [ -z "$opt_all" ] && number=1
+ fi
+
+-stop_at_patch=$(find_unapplied_patch "$stop_at_patch") || exit 1
++stop_at_patch=$(find_unapplied_patch "$stop_at_patch") || exit $?
+
+ [ -z "$opt_verbose" ] && silent_unless_verbose=-s
+ [ -n "$opt_force" ] && opt_leave_rejects=1
+--- a/quilt/scripts/patchfns.in
++++ b/quilt/scripts/patchfns.in
+@@ -477,7 +477,7 @@ find_last_patch()
+ else
+ printf $"No series file found\n" >&2
+ fi
+- return 1
++ return 2
+ fi
+
+ echo "$patch"
+@@ -582,7 +582,7 @@ find_unapplied_patch()
+ then
+ printf $"Patch %s is currently applied\n" \
+ "$(print_patch $patch)" >&2
+- return 1
++ return 2
+ fi
+ echo "$patch"
+ else
+@@ -592,13 +592,13 @@ find_unapplied_patch()
+ then
+ patch_after "$start"
+ else
+- find_first_patch || return 1
++ find_first_patch || return 2
+ fi
+ if [ $? -ne 0 ]
+ then
+ printf $"File series fully applied, ends at patch %s\n" \
+ "$(print_patch $start)" >&2
+- return 1
++ return 2
+ fi
+ fi
+ }