xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-08-23 19:50:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix license save through collective

Browse Source
This commit is contained in:
Jarrod Johnson
2021-11-17 15:56:36 -05:00
parent 9e47c1cfed
commit 6b8dec7764
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
View File

@@ -1522,11 +1522,12 @@ class IpmiHandler(object):
'directory {0}, check ownership and permissions'.format(
checkdir))
for saved in self.ipmicmd.save_licenses(directory):
try:
pwent = pwd.getpwnam(self.current_user)
os.chown(saved, pwent.pw_uid, pwent.pw_gid)
except KeyError:
pass
if self.current_user:
try:
pwent = pwd.getpwnam(self.current_user)
os.chown(saved, pwent.pw_uid, pwent.pw_gid)
except KeyError:
pass
self.output.put(msg.SavedFile(self.node, saved))
def handle_licenses(self):

11
confluent_server/confluent/plugins/hardwaremanagement/redfish.py
View File

@@ -1368,11 +1368,12 @@ class IpmiHandler(object):
'directory {0}, check ownership and permissions'.format(
directory))
for saved in self.ipmicmd.save_licenses(directory):
try:
pwent = pwd.getpwnam(self.current_user)
os.chown(saved, pwent.pw_uid, pwent.pw_gid)
except KeyError:
pass
if self.current_user:
try:
pwent = pwd.getpwnam(self.current_user)
os.chown(saved, pwent.pw_uid, pwent.pw_gid)
except KeyError:
pass
self.output.put(msg.SavedFile(self.node, saved))
def handle_licenses(self):