chiark / gitweb /
cvs-repomove: work with Solaris's shoddy sed. (Closes: #497670)
authorianmdlvl <ianmdlvl>
Sun, 7 Sep 2008 17:00:13 +0000 (17:00 +0000)
committerianmdlvl <ianmdlvl>
Sun, 7 Sep 2008 17:00:13 +0000 (17:00 +0000)
debian/changelog
scripts/cvs-repomove

index 25a7ae7..185deeb 100644 (file)
@@ -1,3 +1,9 @@
+chiark-utils (4.1.30) unstable; urgency=low
+
+  * cvs-repomove: work with Solaris's shoddy sed.  (Closes: #497670)
+
+ --
+
 chiark-utils (4.1.29) unstable; urgency=low
 
   * backup-snaprsync: pass $vardir as argument to snap-drop
index 283002b..a3bb60f 100755 (executable)
@@ -97,7 +97,7 @@ do_move () {
  ls -d -- $srcrepo/CVSROOT >/dev/null
        '"
 
-       dstrepotrans="$(printf "%s" "$dstrepo" | tr / :)"
+       dstrepotrans="$(printf '%s\n' "$dstrepo" | tr / :)"
        movingto="moving-to-$dsthost:$dstrepotrans"
        resume="$("$CVS_RSH" "$srchost" bash -ec "'
  if test -d $srcrepo/$module..$movingto; then
@@ -244,7 +244,7 @@ do_furtle () {
                        exit 4
                        ;;
                *..moved-to-*)
-                       goose="$(printf "%s" \
+                       goose="$(printf '%s\n' \
                                "${new_goose_info#*..moved-to-}" | \
                                tr : / | sed -e 's,/,:,')"
                        ;;