xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-02-19 03:55:36 +00:00
Code Issues Projects Releases Wiki Activity

Restore filename-only import

Browse Source 
The open file handle as implemented
could not pass to the subprocess.

Rather than figure out how to open
and pass the filehandle,
simply let the subprocess
independently open the file
if it isn't passed.
This commit is contained in:
Jarrod Johnson 2023-02-16 09:13:05 -05:00
parent abc639e32b
commit 241800b1c9
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
confluent_server/confluent/osimage.py
View File

@ -805,11 +805,17 @@ class MediaImporter(object):
raise Exception('`osdeploy initialize` must be executed before importing any media')
self.profiles = []
medfile = None
self.medfile = None
if cfm and media in cfm.clientfiles:
medfile = cfm.clientfiles[media]
self.medfile = cfm.clientfiles[media]
medfile = self.medfile
else:
medfile = open(media, 'rb')
identity = fingerprint(medfile)
try:
identity = fingerprint(medfile)
finally:
if not self.medfile:
medfile.close()
if not identity:
raise exc.InvalidArgumentException('Unsupported Media')
self.percent = 0.0
@ -837,7 +843,6 @@ class MediaImporter(object):
del importing[importkey]
raise Exception('{0} already exists'.format(self.targpath))
self.filename = os.path.abspath(media)
self.medfile = medfile
self.error = ''
self.importer = eventlet.spawn(self.importmedia)
@ -851,7 +856,8 @@ class MediaImporter(object):
def importmedia(self):
os.environ['PYTHONPATH'] = ':'.join(sys.path)
os.environ['CONFLUENT_MEDIAFD'] = '{0}'.format(self.medfile.fileno())
if self.medfile:
os.environ['CONFLUENT_MEDIAFD'] = '{0}'.format(self.medfile.fileno())
with open(os.devnull, 'w') as devnull:
self.worker = subprocess.Popen(
[sys.executable, __file__, self.filename, '-b'],