summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2009-11-05 16:15:04 -0500
committerJohn Wiegley <johnw@newartisans.com>2009-11-05 16:15:04 -0500
commit312d4c5f5339c61253e86cd9ce825370eb4be053 (patch)
treec015e100d10acfbf00a7f7c35fca8f9db0d1bd9f
parent67ce33430c1f37f0fa7da62e5bd055c5a00b614d (diff)
downloadfork-ledger-312d4c5f5339c61253e86cd9ce825370eb4be053.tar.gz
fork-ledger-312d4c5f5339c61253e86cd9ce825370eb4be053.tar.bz2
fork-ledger-312d4c5f5339c61253e86cd9ce825370eb4be053.zip
Reverted back to the previous versioning method
-rwxr-xr-xacprep16
1 files changed, 8 insertions, 8 deletions
diff --git a/acprep b/acprep
index 302a6368..b2c39b7c 100755
--- a/acprep
+++ b/acprep
@@ -385,14 +385,14 @@ class PrepareBuild(CommandLineApp):
def current_version(self):
if not self.current_ver:
if exists('.git') and isdir('.git'):
- date = self.get_stdout('git', 'log', '--format=%ci', '-1', 'HEAD')
- date = re.sub(" [-+][0-9][0-9][0-9][0-9]$", "", date)
- when = datetime.datetime.strptime(date, "%Y-%m-%d %H:%M:%S")
- self.current_ver = when.strftime("%Y%m%d_%H%M%S")
- commit = self.get_stdout('git', 'log', '--format=%h', 'HEAD^..HEAD')
- self.current_ver += "_" + commit
- #tag = self.get_stdout('git', 'describe', '--all', '--long')
- #self.current_ver = re.sub('heads/', '', tag)
+ #date = self.get_stdout('git', 'log', '--format=%ci', '-1', 'HEAD')
+ #date = re.sub(" [-+][0-9][0-9][0-9][0-9]$", "", date)
+ #when = datetime.datetime.strptime(date, "%Y-%m-%d %H:%M:%S")
+ #self.current_ver = when.strftime("%Y%m%d_%H%M%S")
+ #commit = self.get_stdout('git', 'log', '--format=%h', 'HEAD^..HEAD')
+ #self.current_ver += "_" + commit
+ tag = self.get_stdout('git', 'describe', '--all', '--long')
+ self.current_ver = re.sub('heads/', '', tag)
else:
self.current_ver = "3.0a"
return self.current_ver