summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--quilt.changes6
-rw-r--r--quilt/diff.in7
2 files changed, 13 insertions, 0 deletions
diff --git a/quilt.changes b/quilt.changes
index edbb3c4..3cc8a56 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Mar 16 19:13:36 CET 2011 - jdelvare@suse.de
+
+- quilt/diff.in: If diffing against snapshot, ensure that snapshot
+ is actually present. If not, bail out with an error message.
+
+-------------------------------------------------------------------
Tue Mar 15 13:47:41 CET 2011 - jdelvare@suse.de
- compat/getopt.in: Add support of options with optional
diff --git a/quilt/diff.in b/quilt/diff.in
index 2824c96..1807b86 100644
--- a/quilt/diff.in
+++ b/quilt/diff.in
@@ -235,6 +235,13 @@ case "$opt_strip_level" in
;;
esac
+# If diffing against snapshot, ensure that snapshot is actually present
+if [ -n "$opt_snapshot" ] && [ ! -d "$QUILT_PC/$snap_subdir" ]
+then
+ printf $"No snapshot to diff against\n" >&2
+ die 1
+fi
+
trap "die 1" SIGTERM
tmp_files=$(gen_tempfile)