diff options
| author | Igor Pashev <igor.pashev@nexenta.com> | 2012-11-13 21:20:46 +0400 |
|---|---|---|
| committer | Igor Pashev <igor.pashev@nexenta.com> | 2012-11-13 21:20:46 +0400 |
| commit | d73deca60d52f13127f8d7f0145fc7bf01f63e85 (patch) | |
| tree | b4a949a58ae7f425eb7d14e8a1f6695dc0de9284 /quilt/patches/fail_on_missing | |
| parent | 135c50cb24211d6cf5873bdb3bb972aaad10f42b (diff) | |
| download | cibs-pkgs-d73deca60d52f13127f8d7f0145fc7bf01f63e85.tar.gz | |
Quilt with Debian patches
Diffstat (limited to 'quilt/patches/fail_on_missing')
| -rw-r--r-- | quilt/patches/fail_on_missing | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/quilt/patches/fail_on_missing b/quilt/patches/fail_on_missing new file mode 100644 index 0000000..7a1a875 --- /dev/null +++ b/quilt/patches/fail_on_missing @@ -0,0 +1,40 @@ + * Make sure that quilt fails when trying to push a non existant patch (ie + if there is a typo in the serie file) unless -f is provided. + (Closes: #358875). + +Upstream status: they asked for some cleanups, which are done. To be submitted. + +--- + quilt/push.in | 7 +++++++ + test/missing.test | 4 ++++ + 2 files changed, 11 insertions(+) + +--- a/quilt/push.in ++++ b/quilt/push.in +@@ -184,6 +184,13 @@ add_patch() + no_reject_files="-r $tmp" + fi + ++ if [ ! -e "$patch_file" -a -z "$opt_force" ] ++ then ++ printf $"Patch %s does not exist\n" \ ++ "$(print_patch $patch)" >&2 ++ return 1 ++ fi ++ + apply_patch $patch "$patch_file" + status=$? + trap "" SIGINT +--- a/test/missing.test ++++ b/test/missing.test +@@ -5,6 +5,10 @@ + < missing2.diff + + $ quilt push -qa ++ > Patch patches/missing1.diff does not exist ++ > Applying patch patches/missing1.diff ++ ++ $ quilt push -qaf + > Applying patch patches/missing1.diff + > Patch patches/missing1.diff does not exist; applied empty patch + > Applying patch patches/missing2.diff |