From d9c086704e8a23ac2360fd9c0ae1f8a5cd703086 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 5 Dec 2012 20:20:48 +0000 Subject: Release script tweaks. --- release | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'release') diff --git a/release b/release index 4dae50d14..ff85cf5cf 100755 --- a/release +++ b/release @@ -30,7 +30,7 @@ def check_diff_with_user(): print 'Aborted' sys.exit(1) -if os.popen('git status -s').read() != '': +if not args.debug and os.popen('git status -s').read() != '': print '%s: uncommitted changes exist.' % sys.argv[0] sys.exit(1) @@ -55,13 +55,9 @@ check_diff_with_user() command("git commit -a -m \"Bump version\"") command("git tag -m \"v%s\" v%s" % (new_version, new_version)) -m = version.Version.bump_and_to_pre -if args.beta: - m = version.Version.to_pre -version.rewrite_wscript(m) - -check_diff_with_user() - -command("git commit -a -m \"Bump version\"") +if args.release: + version.rewrite_wscript(version.Version.bump_and_to_pre) + check_diff_with_user() + command("git commit -a -m \"Bump version\"") command("cp DVD-o-matic*.exe dvdomatic-*.tar.bz2 /home/carl/public_html/carlh.net/software/dvdomatic") -- cgit v1.2.3