From 57a704731b04392b2103b02573fdc4acdfd18a9e Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Fri, 14 Aug 2015 07:55:36 +0200 Subject: [PATCH 1/1] cleanup: avoid writing user.cfg twice --- PVE/AccessControl.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm index d3f1cf6..0400aee 100644 --- a/PVE/AccessControl.pm +++ b/PVE/AccessControl.pm @@ -1093,18 +1093,20 @@ sub remove_vm_access { my ($vmid) = @_; my $delVMaccessFn = sub { my $usercfg = cfs_read_file("user.cfg"); + my $modified; - if (my $acl = $usercfg->{acl}->{'/vms/'.$vmid}) { - delete $usercfg->{acl}->{'/vms/'.$vmid}; - cfs_write_file("user.cfg", $usercfg); + if (my $acl = $usercfg->{acl}->{"/vms/$vmid"}) { + delete $usercfg->{acl}->{"/vms/$vmid"}; + $modified = 1; } if (my $pool = $usercfg->{vms}->{$vmid}) { if (my $data = $usercfg->{pools}->{$pool}) { delete $data->{vms}->{$vmid}; delete $usercfg->{vms}->{$vmid}; - cfs_write_file("user.cfg", $usercfg); + $modified = 1; } } + cfs_write_file("user.cfg", $usercfg) if $modified; }; lock_user_config($delVMaccessFn, "access permissions cleanup for VM $vmid failed"); -- 2.39.2