mirror of
https://github.com/mbusb/multibootusb
synced 2024-11-07 03:20:23 +00:00
Merge branch 'devel' of https://github.com/mbusb/multibootusb into devel
This commit is contained in:
commit
b210bcccbc
@ -51,14 +51,14 @@ def extract_iso(src, dst, pattern=None, suppress_out=True):
|
||||
# gen.log('Executing', _cmd)
|
||||
_7zip_process = subprocess.Popen(_cmd, universal_newlines=True, stdin=subprocess.PIPE, stderr=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE, shell=True)
|
||||
config.status_text = 'Extracting ' + os.path.basename(src)
|
||||
config.status_text = 'Status: Extracting ' + os.path.basename(src).strip()
|
||||
while True:
|
||||
line = _7zip_process.stdout.readline()
|
||||
# gen.log(line)
|
||||
if line.startswith('- '):
|
||||
config.status_text = 'Extracting ' + line[2:]
|
||||
config.status_text = 'Status: Extracting ' + line[2:].strip()
|
||||
elif platform.system() == 'Linux': # line.startswith('Extracting'): # Under Linux it prints directly all the process (may be due to version diff).
|
||||
config.status_text = line
|
||||
config.status_text = 'Status: ' + line.strip()
|
||||
if line == '' and _7zip_process.poll() != None:
|
||||
break
|
||||
|
||||
|
@ -85,7 +85,7 @@ def print_version():
|
||||
Simple log the version number of the multibootusb application
|
||||
:return:
|
||||
"""
|
||||
log('multibootusb version : ', mbusb_version())
|
||||
log('multibootusb version: ', mbusb_version())
|
||||
|
||||
|
||||
def quote(text):
|
||||
@ -207,7 +207,7 @@ def copy_mbusb_dir_usb(usb_disk):
|
||||
log('multibootusb directory could not be copied to ' + usb_mount_path)
|
||||
result = False
|
||||
else:
|
||||
log('multibootus directory already exist. Not copying.')
|
||||
log('multibootusb directory already exists. Not copying.')
|
||||
|
||||
if not os.path.exists(os.path.join(usb_mount_path, 'EFI', 'BOOT', 'multibootusb_grub2.txt')):
|
||||
try:
|
||||
|
Loading…
Reference in New Issue
Block a user