From a59b48e68479ff2347418239b8ed337c4d5c013c Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 12 Jun 2013 21:03:53 +0200 Subject: Use Python 3.x compatible octal literals Python 3.x deprecated octal literals in the form 0755. Use 0o755 instead which works at least with Python 2.6 and newer. Change-Id: I6300e61d78619d8310e0ea7ddc8b46b94c1ef833 --- nova/virt/disk/api.py | 8 ++++---- nova/virt/libvirt/driver.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'nova/virt') diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index 9fdec0e87..5b8782924 100755 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -425,7 +425,7 @@ def _setup_selinux_for_keys(fs, sshdir): restorecon.insert(0, '#!/bin/sh') _inject_file_into_fs(fs, rclocal, ''.join(restorecon), append=True) - fs.set_permissions(rclocal, 0700) + fs.set_permissions(rclocal, 0o700) def _inject_key_into_fs(key, fs): @@ -439,7 +439,7 @@ def _inject_key_into_fs(key, fs): sshdir = os.path.join('root', '.ssh') fs.make_path(sshdir) fs.set_ownership(sshdir, "root", "root") - fs.set_permissions(sshdir, 0700) + fs.set_permissions(sshdir, 0o700) keyfile = os.path.join(sshdir, 'authorized_keys') @@ -452,7 +452,7 @@ def _inject_key_into_fs(key, fs): ]) _inject_file_into_fs(fs, keyfile, key_data, append=True) - fs.set_permissions(keyfile, 0600) + fs.set_permissions(keyfile, 0o600) _setup_selinux_for_keys(fs, sshdir) @@ -467,7 +467,7 @@ def _inject_net_into_fs(net, fs): netdir = os.path.join('etc', 'network') fs.make_path(netdir) fs.set_ownership(netdir, "root", "root") - fs.set_permissions(netdir, 0744) + fs.set_permissions(netdir, 0o744) netfile = os.path.join('etc', 'network', 'interfaces') _inject_file_into_fs(fs, netfile, net) diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 91d5b1a50..6dde42d5a 100755 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -1774,7 +1774,7 @@ class LibvirtDriver(driver.ComputeDriver): # NOTE(vish): No need add the suffix to console.log libvirt_utils.write_to_file( - self._get_console_log_path(instance), '', 007) + self._get_console_log_path(instance), '', 7) if not disk_images: disk_images = {'image_id': instance['image_ref'], -- cgit