Merge branches 'llua-patch-1', 'mohammedamarnah-disk_format_warning' …

…and 'Fix-v0.2.8'

WoeUSB/core.py

@@ -31,9 +31,6 @@
 
 debug = False
 
-#: used in cleanup()
-target_device = ""
-
 CopyFiles_handle = threading.Thread()
 
 #: Execution state for cleanup functions to determine if clean up is required
@@ -572,7 +569,7 @@ def cleanup_mountpoint(fs_mountpoint):
     return 0
 
 
-def cleanup(source_fs_mountpoint, target_fs_mountpoint, temp_directory):
+def cleanup(source_fs_mountpoint, target_fs_mountpoint, temp_directory, target_media):
     """
     :param source_fs_mountpoint:
     :param target_fs_mountpoint:
@@ -608,7 +605,7 @@ def cleanup(source_fs_mountpoint, target_fs_mountpoint, temp_directory):
         utils.print_with_color(_("Some mountpoints are not unmount/cleaned successfully and must be done manually"),
                                "yellow")
 
-    if utils.check_is_target_device_busy(target_device):
+    if utils.check_is_target_device_busy(target_media):
         utils.print_with_color(
             _("Target device is busy, please make sure you unmount all filesystems on target device or shutdown the computer before detaching it."),
             "yellow")
@@ -712,6 +709,7 @@ def run():
         install_mode, source_media, target_media, \
         workaround_bios_boot_flag, target_filesystem_type, new_file_system_label, \
         verbose, debug, parser = result
+
     try:
         main(source_fs_mountpoint, target_fs_mountpoint, source_media, target_media, install_mode, temp_directory,
              target_filesystem_type, workaround_bios_boot_flag, parser)
@@ -722,7 +720,7 @@ def run():
         if debug:
             traceback.print_exc()
 
-    cleanup(source_fs_mountpoint, target_fs_mountpoint, temp_directory)
+    cleanup(source_fs_mountpoint, target_fs_mountpoint, temp_directory, target_media)
 
 
 if __name__ == "__main__":

WoeUSB/gui.py

@@ -222,6 +222,12 @@ def on_refresh(self, __):
 
     def on_install(self, __):
         global woe
+        if wx.MessageBox(
+            _("Are you sure? This will delete all your files and wipe out the selected partition."),
+            _("Cancel"),
+            wx.YES_NO | wx.ICON_QUESTION,
+            self) == wx.NO:
+            return
         if self.is_install_ok():
             is_iso = self.__isoChoice.GetValue()
 

WoeUSB/miscellaneous.py

@@ -2,7 +2,7 @@
 import locale
 import os
 
-__version__ = "0.2.8"
+__version__ = "0.2.9"
 
 translation = gettext.translation("woeusb", os.path.dirname(__file__) + "/locale", [locale.getlocale()[0]], fallback=True)
 translation.install()

setup.py

@@ -48,11 +48,11 @@ def run(self):
 
 setup(
     name='WoeUSB-ng',
-    version='0.2.8',
+    version='0.2.9',
     description='WoeUSB-ng is a simple tool that enable you to create your own usb stick windows installer from an iso image or a real DVD. This is a rewrite of original WoeUSB. ',
     long_description=long_description,
     long_description_content_type='text/markdown',
-    url='http://github.com/WoeUSB/WoeUSB-ng',
+    url='https://github.com/WoeUSB/WoeUSB-ng',
     author='Jakub Szymański',
     author_email='jakubmateusz@poczta.onet.pl',
     license='GPL-3',