cvs-adjustroot: silently succeed for */CVS/Root entries which already match the new...

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index aa22904c59e6976feaa392eea79f05bf7ac9c16f..717e31d6da1c3587801ae3e6abf3a6ad9efcc833 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ chiark-utils (4.5.0~iwj5) unstable; urgency=medium
   * rebuild on current sid: Closes:#811216.
   * cvs-adjustroot: properly exit nonzero in case of error.
     Fixes the first half of #839708.
+  * cvs-adjustroot: silently succeed for */CVS/Root entries which
+    already match the new value.  Closes:#839708 (second half).
 
  --
 

diff --git a/scripts/cvs-adjustroot b/scripts/cvs-adjustroot
index 081859fcdb58b6ba60e97d55c65dfd3b054e8855..0448d9a9f1ae72a03d2730e2a4558c4a050b18af 100755 (executable)
--- a/scripts/cvs-adjustroot
+++ b/scripts/cvs-adjustroot
@@ -35,6 +35,7 @@ new="$1"; shift
 
 if $reinvoke; then
        filename="$1";
+       if cmp -- "$filename" <(printf "%s\n" "$new"); then exit 0; fi
        cmp -- "$filename" <(printf "%s\n" "$old")
        printf "%s\n" "$new" >"$filename".new
        mv -f -- "$filename".new "$filename"