LGTM, thanks
On Sat, Feb 2, 2013 at 1:07 PM, Guido Trotter <[email protected]> wrote: > The latest lxc patches included a few whitespace style errors, that make > lint fail. This patch fixes those. > > Signed-off-by: Guido Trotter <[email protected]> > --- > lib/hypervisor/hv_lxc.py | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/lib/hypervisor/hv_lxc.py b/lib/hypervisor/hv_lxc.py > index d7deee8..f080640 100644 > --- a/lib/hypervisor/hv_lxc.py > +++ b/lib/hypervisor/hv_lxc.py > @@ -149,8 +149,8 @@ class LXCHypervisor(hv_base.BaseHypervisor): > cgroup = cls._GetCgroupMountPoint() > try: > memory = int(utils.ReadFile(utils.PathJoin(cgroup, 'lxc', > - instance_name, > - "memory.limit_in_bytes"))) > + instance_name, > + > "memory.limit_in_bytes"))) > except EnvironmentError: > # memory resource controller may be disabled, ignore > memory = 0 > @@ -161,7 +161,7 @@ class LXCHypervisor(hv_base.BaseHypervisor): > """Get the list of running instances. > > """ > - return [ iinfo[0] for iinfo in self.GetAllInstancesInfo() ] > + return [iinfo[0] for iinfo in self.GetAllInstancesInfo()] > > def GetInstanceInfo(self, instance_name): > """Get instance properties. > @@ -249,12 +249,12 @@ class LXCHypervisor(hv_base.BaseHypervisor): > # Conditionally enable, memory resource controller might be disabled > cgroup = self._GetCgroupMountPoint() > if os.path.exists(utils.PathJoin(cgroup, 'memory.limit_in_bytes')): > - out.append("lxc.cgroup.memory.limit_in_bytes = %dM" % > - instance.beparams[constants.BE_MAXMEM]) > + out.append("lxc.cgroup.memory.limit_in_bytes = %dM" % > + instance.beparams[constants.BE_MAXMEM]) > > if os.path.exists(utils.PathJoin(cgroup, > 'memory.memsw.limit_in_bytes')): > - out.append("lxc.cgroup.memory.memsw.limit_in_bytes = %dM" % > - instance.beparams[constants.BE_MAXMEM]) > + out.append("lxc.cgroup.memory.memsw.limit_in_bytes = %dM" % > + instance.beparams[constants.BE_MAXMEM]) > > # Device control > # deny direct device access > @@ -355,7 +355,7 @@ class LXCHypervisor(hv_base.BaseHypervisor): > result.output) > > if not os.path.ismount(root_dir): > - return > + return > > for mpath in self._GetMountSubdirs(root_dir): > result = utils.RunCmd(["umount", mpath]) > -- > 1.7.10.4 > >
