← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to .pc/nova-console-monitor.patch/nova/virt/libvirt/connection.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-04-04 09:25:14 UTC
  • mfrom: (1.1.52)
  • Revision ID: package-import@ubuntu.com-20120404092514-ry1k7mjzd6plivdk
Tags: 2012.1~rc3-0ubuntu1
* New Upstream release. 
* debian/control: Conflict nova-vncproxy with novnc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/nova-console-monitor.patch/nova/virt/libvirt/connection.py
619
619
 
620
620
        (image_service, image_id) = nova.image.get_image_service(
621
621
            context, instance['image_ref'])
622
 
        base = image_service.show(context, image_id)
 
622
        try:
 
623
            base = image_service.show(context, image_id)
 
624
        except exception.ImageNotFound:
 
625
            base = {}
 
626
 
623
627
        _image_service = nova.image.get_image_service(context, image_href)
624
628
        snapshot_image_service, snapshot_image_id = _image_service
625
629
        snapshot = snapshot_image_service.show(context, snapshot_image_id)
635
639
                                   'ramdisk_id': instance['ramdisk_id'],
636
640
                                   }
637
641
                    }
638
 
        if 'architecture' in base['properties']:
 
642
        if 'architecture' in base.get('properties', {}):
639
643
            arch = base['properties']['architecture']
640
644
            metadata['properties']['architecture'] = arch
641
645