From 93aa4a0c9bba8c4d4594906631ef9fe7663684c6 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 16 Jul 2011 17:59:10 -0400
Subject: [PATCH] Fixed the version commiting logic - and moved it.

---
 old_tarball_script.sh | 8 +++++---
 ppa_script.sh         | 3 ++-
 tarball_script.sh     | 9 ++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/old_tarball_script.sh b/old_tarball_script.sh
index c8c3a968..1873b171 100755
--- a/old_tarball_script.sh
+++ b/old_tarball_script.sh
@@ -27,10 +27,12 @@ then
 	echo "Tarball already built. Not rebuilding."
 	exit 0
 fi
-echo "$PROJECT $revno" '>>' "$RECORDFILE"
-cat "$RECORDFILE" | sort > "$RECORDFILE"
-( cd $VERSIONDIR ; bzr up ;  bzr commit -m"Added $PROJECT $snapshotversion" )
 
 python setup.py sdist
 tarball=$(echo dist/*.tar.gz)
 mv "$tarball" "dist/$(basename $tarball .tar.gz)${SEPARATOR}bzr${revno}.tar.gz"
+
+echo "$PROJECT $revno" >> "$RECORDFILE"
+sort "$RECORDFILE" > "$RECORDFILE".tmp
+mv "$RECORDFILE".tmp "$RECORDFILE"
+( cd $VERSIONDIR ; bzr up ;  bzr commit -m"Added $PROJECT $snapshotversion" )
diff --git a/ppa_script.sh b/ppa_script.sh
index f2effb23..f382409b 100755
--- a/ppa_script.sh
+++ b/ppa_script.sh
@@ -64,7 +64,8 @@ do
 		buildno=$(($buildno + 1))
 	else
 		echo "$PROJECT $pkgversion" >> "$PKGRECORDFILE"
-		cat "$PKGRECORDFILE" | sort > "$PKGRECORDFILE"
+		sort "$PKGRECORDFILE" > "$PKGRECORDFILE".tmp
+                mv "$PKGRECORDFILE".tmp "$PKGRECORDFILE"
 		( cd $VERSIONDIR ;
 		 bzr up ;
 		 bzr commit -m"Added $PROJECT $snapshotversion" )
diff --git a/tarball_script.sh b/tarball_script.sh
index 523593d7..450264b6 100755
--- a/tarball_script.sh
+++ b/tarball_script.sh
@@ -106,9 +106,7 @@ fi
 
 
 snapshotversion=$(find_next_version)
-echo "$PROJECT $snapshotversion" >> "$RECORDFILE"
-cat "$RECORDFILE" | sort > "$RECORDFILE"
-( cd $VERSIONDIR ; bzr up ;  bzr commit -m"Added $PROJECT $snapshotversion" )
+
 
 # Should be ~ if tarball version is the one we're working *toward*. (By far preferred!)
 # Should be + if tarball version is already released and we're moving forward after it.
@@ -122,3 +120,8 @@ tarball=$(echo dist/*.tar.gz)
 
 echo mv "$tarball" "dist/$(basename $tarball .tar.gz)${SEPARATOR}${snapshotversion}.tar.gz"
 mv "$tarball" "dist/$(basename $tarball .tar.gz)${SEPARATOR}${snapshotversion}.tar.gz"
+
+echo "$PROJECT $revno" >> "$RECORDFILE"
+sort "$RECORDFILE" > "$RECORDFILE".tmp
+mv "$RECORDFILE".tmp "$RECORDFILE"
+