illumos gate

I tried to upgrade from 134. Everything seems to work fine until the Update Phase where I get an "upgrade failed":

tbingen@laTaie:~$ pfexec pkg publisher
PUBLISHER                             TYPE     STATUS   URI
openindiana.org          (preferred)  origin   online   http://pkg.openindiana.org/dev/
opensolaris.org          (non-sticky) origin   online   http://pkg.openindiana.org/legacy/
tbingen@laTaie:~$ pfexec pkg image-update -v --be-name oi-151-1-4
Solver: [ Variables: 6479 Clauses: 103970 Iterations: 43 State: Succeeded]
Timings: [phase 1:  2.083, phase 2:  0.102, phase 3: 37.052, phase 4: 18.977, phase 5:  0.024]
Maintained incorporations: None

Package version changes:
None -> pkg://openindiana.org/x11/xclipboard@1.1.0,5.11-0.151.1.4:20120503T062206Z
pkg://opensolaris.org/gnome/locale/es@0.5.11,5.11-0.134:20100302T024403Z -> pkg://openindiana.org/gnome/locale/es@0.5.11,5.11-0.151.1.4:20120502T223653Z
[...]
None -> pkg://openindiana.org/x11/xconsole@1.0.3,5.11-0.151.1.4:20120503T062210Z
Actuators:
      refresh_fmri: svc:/system/logadm-upgrade:default
      restart_fmri: svc:/application/opengl/ogl-select:default
      restart_fmri: svc:/application/desktop-cache/pixbuf-loaders-installer:default
      restart_fmri: svc:/application/desktop-cache/gconf-cache:default
      restart_fmri: svc:/application/desktop-cache/input-method-cache:default
      restart_fmri: svc:/system/rbac:default
      restart_fmri: svc:/application/font/fc-cache:default
      restart_fmri: svc:/system/manifest-import:default
      restart_fmri: svc:/application/desktop-cache/icon-cache:default
      restart_fmri: svc:/application/desktop-cache/mime-types-cache:default
      restart_fmri: svc:/application/desktop-cache/desktop-mime-cache:default
     reboot-needed: true

DOWNLOAD                                  PKGS       FILES    XFER (MB)
Completed                              930/930 54383/54383  707.0/707.0 

PHASE                                        ACTIONS
Removal Phase                            21600/33513 
Warning - directory usr/share/man/cat5 not empty - contents preserved in /tmp/tmpR0gjoG/var/pkg/lost+found/usr/share/man/cat5-20120509T162552Z

Warning - directory usr/share/man/cat1m not empty - contents preserved in /tmp/tmpR0gjoG/var/pkg/lost+found/usr/share/man/cat1m-20120509T162552Z

Warning - directory usr/share/man/cat1 not empty - contents preserved in /tmp/tmpR0gjoG/var/pkg/lost+found/usr/share/man/cat1-20120509T162552Z

Warning - directory usr/share/icons/Neutral_Plus_Inv not empty - contents preserved in /tmp/tmpR0gjoG/var/pkg/lost+found/usr/share/icons/Neutral_Plus_Inv-20120509T162552Z
Removal Phase                            33513/33513 
Install Phase                            37153/37153 
Update Phase                             48900/55425
Action upgrade failed for 'usr/lib/python2.6/vendor-packages/cherrypy/cherryd' (pkg://openindiana.org/library/python-2/cherrypy-26):
 TypeError: 'NoneType' object is not callable
 The running system has not been modified. Modifications were only made to a clone of the running system.  This clone is mounted at /tmp/tmpR0gjoG should you wish to inspect it.
pkg: An unexpected error happened during image-update: 'NoneType' object is not callable*
Traceback (most recent call last):
  File "/usr/bin/pkg", line 3796, in handle_errors
    __ret = func(*args, **kwargs)
  File "/usr/bin/pkg", line 3773, in main_func
    return func(img, pargs)
  File "/usr/bin/pkg", line 1226, in image_update
    ret_code = __api_execute_plan(op, api_inst)
  File "/usr/bin/pkg", line 865, in __api_execute_plan
    api_inst.execute_plan()
  File "/usr/lib/python2.6/vendor-packages/pkg/client/api.py", line 674, in execute_plan
    self.__img.imageplan.execute()
  File "/usr/lib/python2.6/vendor-packages/pkg/client/imageplan.py", line 1095, in execute
    p.execute_update(src, dest)
  File "/usr/lib/python2.6/vendor-packages/pkg/client/pkgplan.py", line 316, in execute_update
    dest.install(self, src)
  File "/usr/lib/python2.6/vendor-packages/pkg/actions/file.py", line 165, in install
    stream = self.data()
TypeError: 'NoneType' object is not callable

pkg: This is an internal error.  Please let the developers know about this
problem by filing a bug at http://defect.opensolaris.org and including the
above traceback and this message.  The version of pkg(5) is '105ecd539b7d'.