From: Claudio Bley <cbley@av-test.de>
Date: Wed, 30 Jan 2013 08:33:36 +0000 (+0100)
Subject: apibuild.py: fix TypeError raised in except clause
X-Git-Tag: v1.0.3-rc1~274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9170ba151d8b9552e3acab5e0c32f972db499b16;p=thirdparty%2Flibvirt.git

apibuild.py: fix TypeError raised in except clause

When an exception happened inside the try clause in serialize_function,
a new exception was raised in the except clause subsequently:

Traceback (most recent call last):
  File "./apibuild.py", line 2529, in <module>
    rebuild("libvirt")
  File "./apibuild.py", line 2513, in rebuild
    builder.serialize()
  File "./apibuild.py", line 2467, in serialize
    self.serialize_function(output, function)
  File "./apibuild.py", line 2208, in serialize_function
    self.warning("Failed to save function %s info: " % name, `id.info`)
TypeError: warning() takes exactly 2 arguments (3 given)

Use the correct number of arguments for self.warning and print the
original exception to stderr.
---

diff --git a/docs/apibuild.py b/docs/apibuild.py
index 91dabf83ce..2d7293639a 100755
--- a/docs/apibuild.py
+++ b/docs/apibuild.py
@@ -2198,7 +2198,8 @@ class docBuilder:
                     output.write("      <arg name='%s' type='%s' info='%s'/>\n" % (param[1], param[0], escape(param[2])))
                     self.indexString(name, param[2])
         except:
-            self.warning("Failed to save function %s info: " % name, `id.info`)
+            print >>sys.stderr, "Exception:", sys.exc_info()[1]
+            self.warning("Failed to save function %s info: %s" % (name, `id.info`))
         output.write("    </%s>\n" % (id.type))
 
     def serialize_exports(self, output, file):