diff options
| author | Ed Leafe <ed@leafe.com> | 2011-01-21 16:10:26 -0500 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2011-01-21 16:10:26 -0500 |
| commit | 09188c61d5359750f9deadcf912f0fa5fbf005b7 (patch) | |
| tree | 53006dc213fc28f8c74179516f109c93603f429a /nova/virt | |
| parent | 75f93d83be59a85b63a267dc22458a133c591f8e (diff) | |
| parent | ec60562b1a6d18e6df4024870468c0501dc692f9 (diff) | |
Resolved trunk merge conflicts
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt_conn.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 0af9bf42d..6477928e2 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -511,7 +511,6 @@ class LibvirtConnection(object): base_dir = os.path.join(FLAGS.instances_path, '_base') if not os.path.exists(base_dir): os.mkdir(base_dir) - os.chmod(base_dir, 0777) base = os.path.join(base_dir, fname) if not os.path.exists(base): fn(target=base, *args, **kwargs) @@ -542,7 +541,6 @@ class LibvirtConnection(object): # ensure directories exist and are writable utils.execute('mkdir -p %s' % basepath(suffix='')) - utils.execute('chmod 0777 %s' % basepath(suffix='')) LOG.info(_('instance %s: Creating image'), inst['name']) f = open(basepath('libvirt.xml'), 'w') @@ -734,7 +732,8 @@ class LibvirtConnection(object): 'cpu_time': cpu_time} def get_diagnostics(self, instance_name): - raise exception.APIError("diagnostics are not supported for libvirt") + raise exception.APIError(_("diagnostics are not supported " + "for libvirt")) def get_disks(self, instance_name): """ |