[PATCH 03/21] migrate: fix for python2
Felipe Contreras
felipe.contreras at gmail.com
Sun May 13 10:14:11 EDT 2012
Signed-off-by: Felipe Contreras <felipe.contreras at gmail.com>
---
migrate.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/migrate.sh b/migrate.sh
index 5a9228f..d4c8775 100755
--- a/migrate.sh
+++ b/migrate.sh
@@ -45,6 +45,8 @@ fi
# this statement out
export PATH=.:$PATH
+: ${PYTHON:=python}
+
if [ -d tmpfs ] ; then
if ! mount | grep -Fq "`pwd`/tmpfs" ; then
sudo mount -t tmpfs tmpfs tmpfs
@@ -124,7 +126,7 @@ fi
# Add a committer cert with the mapped version of the signer of the changelog.
# Our patched `hg convert` will append this information to the changelog.
-./add-committer-certs.py $db $key
+$PYTHON ./add-committer-certs.py $db $key
# This has to be done after adding the committer certs, or that script will
# use the wrong signer (since the changelog certs are recreated).
@@ -141,10 +143,10 @@ patch -p0 svn-patch-authors svn-patch-authors.diff >/dev/null
cat svn-patch-authors.gtk1-stable >> svn-patch-authors
cat svn-patch-authors.missing >> svn-patch-authors
cat svn-patch-authors.oldstatus >> svn-patch-authors
-./fix-svn-author-certs.py $db $key
+$PYTHON ./fix-svn-author-certs.py $db $key
# Alert us of revisions that still need fixing...
-./check-authors-and-committers.py $db
+$PYTHON ./check-authors-and-committers.py $db
targetrepodir=$destrepo.dir
rm -rf $targetrepodir
--
1.7.10.1
More information about the Devel
mailing list