Try to fix up beta generation.

2 files changed, 13 insertions, 2 deletions

diff --git a/release b/release
index 30c2f495d..92ca9322d 100755
--- a/release
+++ b/release
@@ -34,7 +34,11 @@ if os.popen('git status -s').read() != '':
     print '%s: uncommitted changes exist.' % sys.argv[0]
     sys.exit(1)
 
-new_version = version.rewrite_wscript(version.Version.to_release)
+m = Version.to_release
+if args.beta:
+    m = Version.to_beta
+
+new_version = version.rewrite_wscript(m)
 version.append_to_changelog(new_version)
 
 command("./waf clean")
@@ -51,7 +55,10 @@ check_diff_with_user()
 command("git commit -a -m \"Bump version\"")
 command("git tag -m \"v%s\" v%s" % (new_version, new_version))
 
-version.rewrite_wscript(version.Version.bump_and_to_pre)
+m = Version.bump_and_to_pre
+if args.beta:
+    m = Version.to_pre
+version.rewrite_wscript(m)
 
 check_diff_with_user()
 
diff --git a/version.py b/version.py
index c11a623d2..89be92398 100644
--- a/version.py
+++ b/version.py
@@ -33,6 +33,10 @@ class Version:
         self.pre = False
         self.beta = None
 
+    def to_pre(self):
+        self.pre = True
+        self.beta = None
+
     def bump_and_to_pre(self):
         self.bump()
         self.pre = True