From a97a0f9bcb23c119de5a7bed10d7add5cd5546b8 Mon Sep 17 00:00:00 2001 From: gfxmonk Date: Wed, 5 Jan 2011 21:50:33 +1100 Subject: [PATCH] ignore failure when setup.py has no version declaration --- version.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/version.py b/version.py index 9773842..f0c3907 100755 --- a/version.py +++ b/version.py @@ -26,9 +26,10 @@ def replace(filename, regex, val): return None with open(filename) as f: lines = f.read() + match = re.search(regex, lines) if val is None: - return re.search(regex, lines).group('version') - else: + return match.group('version') if match else None + elif match: with open(filename, 'w') as f: f.write(re.sub(regex, r"\g
%s" % (val,), lines))
 		return True
@@ -234,12 +235,13 @@ def split_suffix(part):
 if __name__ == '__main__':
 	import optparse
 	p = optparse.OptionParser(usage="%prog [OPTIONS] [version]")
-	p.add_option('-v', '--verbose', help="print more debugging info")
+	p.add_option('-v', '--verbose', action='store_true', help="print more debugging info", default=False)
 	p.add_option('--pre', dest='suffix', help="set -pre suffix")
 	p.add_option('--rc', dest='suffix', help="set -rc suffix")
 	p.add_option('--post', dest='suffix', help="set -post suffix")
 
 	opts, args = p.parse_args()
+	VERBOSE = opts.verbose
 
 	try:
 		main(opts, *args)