xend.catchbt.patch

   1 --- xen-4.1.2/tools/python/xen/xend/image.py.orig       2011-10-20 18:05:44.000000000 +0100
   2 +++ xen-4.1.2/tools/python/xen/xend/image.py    2011-11-20 20:41:10.730905790 +0000
   3 @@ -43,7 +43,11 @@
   4  from xen.util import utils
   5  from xen.xend import osdep
   6
   7 -xc = xen.lowlevel.xc.xc()
   8 +try:
   9 +    xc = xen.lowlevel.xc.xc()
  10 +except Exception:
  11 +    print >>sys.stderr, ('xend/image.py: Error connecting to hypervisor')
  12 +    os._exit(1)
  13
  14  MAX_GUEST_CMDLINE = 1024
  15
  16 --- xen-4.1.2/tools/python/xen/xend/XendLogging.py.orig 2011-10-20 18:05:44.000000000 +0100
  17 +++ xen-4.1.2/tools/python/xen/xend/XendLogging.py      2012-01-10 21:27:57.304916048 +0000
  18 @@ -132,7 +132,11 @@
  19          fileHandler = openFileHandler(filename)
  20          logfilename = filename
  21      except IOError:
  22 -        logfilename = tempfile.mkstemp("-xend.log")[1]
  23 +        try:
  24 +            logfilename = tempfile.mkstemp("-xend.log")[1]
  25 +        except IOError:
  26 +            print >>sys.stderr, ('xend/XendLogging.py: Unable to open standard or temporary log file for xend')
  27 +            os._exit(1)
  28          fileHandler = openFileHandler(logfilename)
  29
  30      fileHandler.setFormatter(logging.Formatter(LOGFILE_FORMAT, DATE_FORMAT))