From: ianmdlvl <ianmdlvl>
Date: Sun, 7 Sep 2008 17:00:13 +0000 (+0000)
Subject: cvs-repomove: work with Solaris's shoddy sed.  (Closes: #497670)
X-Git-Tag: debian_version_4_1_30~10
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=9532ae8327cb78467546612f3008e467d092d987

cvs-repomove: work with Solaris's shoddy sed.  (Closes: #497670)
---

diff --git a/debian/changelog b/debian/changelog
index 25a7ae7..185deeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/scripts/cvs-repomove b/scripts/cvs-repomove
index 283002b..a3bb60f 100755
--- a/scripts/cvs-repomove
+++ b/scripts/cvs-repomove
@@ -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,/,:,')"
 			;;