Remove os.sync() and a dubug print.

pull/340/head
shinji-s 6 years ago
parent fc7e988cbf
commit 4ce5277eac

@ -126,9 +126,6 @@ def install_distro():
else:
iso.iso_extract_full(config.image_path, install_dir)
if platform.system() == 'Linux':
log('ISO extracted successfully. Sync is in progress...')
os.sync()
if config.persistence != 0:
log('Creating persistence...')
@ -236,8 +233,6 @@ def install_patch():
'c32box.c32')
elif config.distro == 'debian':
if platform.system() == 'Linux': # Need to syn under Linux. Otherwise, USB disk becomes random read only.
os.sync()
iso_file_list = iso.iso_file_list(config.image_path)
if not any(s.strip().lower().endswith("makeboot.sh")
for s in iso_file_list):

@ -368,9 +368,6 @@ class AppGui(qemu.Qemu, Imager, QtWidgets.QMainWindow, Ui_MainWindow):
update_distro_cfg_files(config.image_path, config.usb_disk,
config.distro, config.persistence)
self.update_list_box(config.usb_disk)
if sys.platform.startswith("linux"):
self.ui.statusbar.showMessage("Status: Sync is in progress...")
os.sync()
self.ui.statusbar.showMessage("Status: Idle")
self.ui_disable_persistence()
log(iso_name(config.image_path) + ' has been successfully installed.')
@ -555,9 +552,6 @@ class AppGui(qemu.Qemu, Imager, QtWidgets.QMainWindow, Ui_MainWindow):
# update_sys_cfg_file(config.uninstall_distro_dir_name)
self.update_list_box(config.usb_mount)
if sys.platform.startswith("linux"):
self.ui.statusbar.showMessage("Status: Sync in progress...")
os.sync()
self.ui.statusbar.showMessage("Status: Idle")
QtWidgets.QMessageBox.information(self, 'Uninstall Complete...',
config.uninstall_distro_dir_name + ' has been successfully removed.')

@ -236,7 +236,6 @@ def build_distro_bootsector_impl(usb_disk, options,
else:
config.status_text = 'Failed to copy boot sector...'
log("\nFailed to copy boot sector...\n")
print ("RETURNING tmp_bs_File")
return tmp_bs_file
else:
config.status_text = 'Failed to install syslinux on distro directory...'

@ -89,9 +89,6 @@ def delete_frm_file_list(iso_file_list, uninstall_distro_dir_name):
if os.path.exists(os.path.join(usb_mount, generic.strip("/"))):
os.remove(os.path.join(usb_mount, generic.strip("/")))
gen.log('Removed files from ' + uninstall_distro_dir_name)
if platform.system() == 'Linux':
gen.log('Syncing....')
os.sync()
@ -108,7 +105,6 @@ def do_uninstall_distro(target_distro, uninstall_distro_dir_name):
usb_mount = usb_details['mount_point']
if platform.system() == 'Linux':
os.sync()
# remove 'immutable' from files on ext2/3/4 fs
if usb_mount:
subprocess.call("chattr -i -R %s/* 2>/dev/null" % usb_mount, shell=True)
@ -149,8 +145,6 @@ def do_uninstall_distro(target_distro, uninstall_distro_dir_name):
shutil.rmtree(os.path.join(usb_mount, "trk3"))
if os.path.exists(uninstall_distro_dir_name_fullpath):
if platform.system() == 'Linux':
os.sync()
shutil.rmtree(uninstall_distro_dir_name_fullpath)
delete_frm_file_list(iso_file_list, uninstall_distro_dir_name)
@ -178,8 +172,6 @@ def update_sys_cfg_file(uninstall_distro_dir_name):
Main function to remove uninstall distro specific operations.
:return:
"""
if platform.system() == 'Linux':
os.sync()
sys_cfg_file = os.path.join(config.usb_mount, "multibootusb", "syslinux.cfg")
if not os.path.exists(sys_cfg_file):
@ -201,8 +193,6 @@ def update_grub_cfg_file(uninstall_distro_dir_name):
Main function to remove uninstall distro name from the grub.cfg file.
:return:
"""
if platform.system() == 'Linux':
os.sync()
grub_cfg_file = os.path.join(config.usb_mount, "multibootusb",
"grub", "grub.cfg")
@ -231,8 +221,6 @@ def uninstall_progress():
from . import progressbar
usb_details = config.usb_details
usb_mount = usb_details['mount_point']
if platform.system() == 'Linux':
os.sync()
uninstall_distro_dir_name = config.uninstall_distro_dir_name \
.replace('\n', '')

@ -421,8 +421,6 @@ def update_mbusb_cfg_file(iso_link, usb_uuid, usb_mount, distro):
Update main multibootusb suslinux.cfg file after distro is installed.
:return:
"""
if platform.system() == 'Linux':
os.sync()
log('Updating multibootusb config file...')
name_from_iso = iso_basename(iso_link)
name_of_iso = iso_name(iso_link)

Loading…
Cancel
Save