xen/tools: Fix gen-cpuid.py's ability to report errors

c/s 18596903 "xen/tools: support Python 2 and Python 3" unfortunately
introduced a TypeError when changing how Fail exceptions were printed:

  /local/xen.git/xen/../xen/tools/gen-cpuid.py:Traceback (most recent call last):
    File "/local/xen.git/xen/../xen/tools/gen-cpuid.py", line 483, in <module>
        sys.stderr.write(e)
  TypeError: expected a character buffer object

Coerce e to a string before printing.  While changing this, fold the three
write() calls making up the line into a single one, and take the opportunity
to neaten the output.

A sample error is:

  /local/xen.git/xen/tools/gen-cpuid.py: Fail: Aliased value between FOO and BAR

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
Andrew Cooper authored and Wei Liu committed 2018-11-27 16:57:41 +00:00
1 parent dc80c42484
commit c9d7fdb83b
1 file changed
+2 -3
+2 -3
View File
@@ -479,9 +479,8 @@ if __name__ == "__main__":
sys.exit(main())
except Fail:
e = sys.exc_info()[1]
sys.stderr.write("%s:" % (sys.argv[0],))
sys.stderr.write(e)
sys.stderr.write("\n")
sys.stderr.write("%s: Fail: %s\n" %
(os.path.abspath(sys.argv[0]), str(e)))
sys.exit(1)
except SystemExit:
e = sys.exc_info()[1]
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.