chiark / gitweb /
cvs-adjustroot: silently succeed for */CVS/Root entries which already match the new...
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 5 Nov 2016 12:06:33 +0000 (12:06 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 5 Nov 2016 12:24:30 +0000 (12:24 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
debian/changelog
scripts/cvs-adjustroot

index aa22904..717e31d 100644 (file)
@@ -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).
 
  --
 
index 081859f..0448d9a 100755 (executable)
@@ -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"