[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Can't build today's git pull
From: |
Peter Chubb |
Subject: |
Can't build today's git pull |
Date: |
Thu, 18 Feb 2010 09:47:21 +1100 |
User-agent: |
Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (Gojō) APEL/10.7 MULE XEmacs/21.4 (patch 22) (Instant Classic) (i486-linux-gnu) |
...
chmod 755 out/convert-ly
/usr/src/lilypond/scripts/build/out/help2man out/convert-ly > out/convert-ly.1
out/convert-ly:341: Warning: 'as' will become a reserved keyword in Python 2.6
File "out/convert-ly", line 341
except InvalidVersion as ex:
^
SyntaxError: invalid syntax
help2man: can't get `--help' info from out/convert-ly
...
This is with python version 2.5.5
I suggest this patch, which *should* work with both 2.6 and 2.5
(but warning: I am *not* a python programmer).
Signed-off-by: Peter Chubb <address@hidden>
---
scripts/convert-ly.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: lilypond/scripts/convert-ly.py
===================================================================
--- lilypond.orig/scripts/convert-ly.py 2010-02-18 09:16:54.522166613 +1100
+++ lilypond/scripts/convert-ly.py 2010-02-18 09:36:01.082161642 +1100
@@ -319,7 +319,7 @@
do_one_file (f)
except UnknownVersion:
error (_ ("%s: Unable to determine version. Skipping") % f)
- except InvalidVersion as ex:
+ except InvalidVersion, ex:
error (_ ("%s: Invalid version string `%s' \n"
"Valid version strings consist of three numbers, "
"separated by dots, e.g. `2.8.12'") % (f, ex.version) )
--
Dr Peter Chubb www.nicta.com.au peter DOT chubb AT nicta.com.au
http://www.ertos.nicta.com.au ERTOS within National ICT Australia
From Imagination to Impact Imagining the (ICT) Future
- Can't build today's git pull,
Peter Chubb <=
Re: Can't build today's git pull, Graham Percival, 2010/02/19