Guba Sándor · @gubasandor · Őry Máté · Őry Máté
--- a/disk.py
+++ b/disk.py
+    def merge(self, task, new_disk):
        """ Merging a new_disk from the actual disk and its base.
        """
+        from time import sleep
+        import threading
+
+        class AbortException(Exception):
+            pass
+        if task.is_aborted():
+            raise AbortException()
        # Check if file already exists
        if os.path.isfile(new_disk.get_path()):
            raise Exception('File already exists: %s' % self.get_path())
        if self.format == "iso":
            os.symlink(self.get_path(), new_disk.get_path())
        elif self.base_name:
--- a/disk.py
+++ b/disk.py
+            try:
+                t = threading.Thread(
+                    target=copy,
+                    args=(
+                        self.get_path(),
+                        new_disk.get_path()))
+                while True:
+                    if not t.isAlive():
+                        break
+                    if task.is_aborted():
+                        logger.warning(
+                            "Merging new disk %s is aborted by user.",
+                            new_disk.get_path())
+                        raise AbortException
+            except AbortException:
+                t._Thread__stop()