Don't stop after showing one dry run diff.

conormcd · Dec 17, 2013 · 96a0a34 · 96a0a34
1 parent 47822db
commit 96a0a34
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/control/lib/common b/control/lib/common
@@ -58,7 +58,7 @@ copyfile() {
             fi
         elif dry_run; then
             echo "Will apply the following diff to ${dst}:"
-            diff -ruN ${dst} ${src}
+            diff -ruN ${dst} ${src} || true
         else
             cmd cp ${src} ${dst}
         fi
@@ -104,7 +104,7 @@ copyfile_encrypted() {
             if ! diff -q ${tempfile} ${dst} 2>&1 > /dev/null; then
                 if dry_run; then
                     echo "Will apply the following diff to ${dst}:"
-                    diff -ruN ${dst} ${tempfile}
+                    diff -ruN ${dst} ${tempfile} || true
                 else
                     cmd cp ${tempfile} ${dst}
                 fi
@@ -114,7 +114,7 @@ copyfile_encrypted() {
             if ! diff -q ${tempfile} ${dst} 2>&1 > /dev/null; then
                 if dry_run; then
                     echo "Will apply the following diff to ${dst}:"
-                    diff -ruN ${tempfile} ${src}
+                    diff -ruN ${tempfile} ${src} || true
                 else
                     openssl_enc ${tempfile} ${dst}
                 fi