summaryrefslogtreecommitdiff
path: root/acprep
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2009-11-09 13:25:45 -0500
committerJohn Wiegley <johnw@newartisans.com>2009-11-09 13:25:45 -0500
commit865c0ff828f88ed1d00eea73a3fc55b3e57d21b3 (patch)
tree5acdfae32811b25fb46271bf349a216bea41fddb /acprep
parent55c7792c9329f97dd19fc5aeca466cb2de4fbf9c (diff)
parent9b396b41220646cf73fcd2a8afebcee06dde2a29 (diff)
downloadfork-ledger-865c0ff828f88ed1d00eea73a3fc55b3e57d21b3.tar.gz
fork-ledger-865c0ff828f88ed1d00eea73a3fc55b3e57d21b3.tar.bz2
fork-ledger-865c0ff828f88ed1d00eea73a3fc55b3e57d21b3.zip
Merge branch 'next'
Diffstat (limited to 'acprep')
-rwxr-xr-xacprep4
1 files changed, 2 insertions, 2 deletions
diff --git a/acprep b/acprep
index 7335e17d..055d2306 100755
--- a/acprep
+++ b/acprep
@@ -195,7 +195,7 @@ class PrepareBuild(CommandLineApp):
self.envvars = {
'PYTHON_HOME': '/usr',
- 'PYTHON_VERSION': '2.5',
+ 'PYTHON_VERSION': '2.6',
'BOOST_SUFFIX': None,
'BOOST_HOME': '/usr',
'LEDGER_PRODUCTS': None,
@@ -394,7 +394,7 @@ class PrepareBuild(CommandLineApp):
tag = self.get_stdout('git', 'describe', '--all', '--long')
self.current_ver = re.sub('heads/', '', tag)
else:
- self.current_ver = "3.0a"
+ self.current_ver = "unknown"
return self.current_ver
def need_to_prepare_autotools(self):