New writing method replacing dd.exe under Windows.

1 files changed, 12 insertions, 8 deletions

diff --git a/liveusb/gui.py b/liveusb/gui.py
index 9de97e5..da85b9f 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -21,8 +21,6 @@
 #            Kushal Das <kushal@fedoraproject.org>
 #            Aurelien Lefebvre <alefebvre@mandriva.com>
 
-import os
-import sys
 import logging
 
 from datetime import datetime
@@ -105,8 +103,8 @@ class LiveUSBThread(QtCore.QThread):
         except LiveUSBError, e:
             self.status(e.message)
 
-        except Exception, e:
-            self.status(_("LiveUSB creation failed!"))
+#        except Exception, e:
+#            self.status(_("LiveUSB creation failed!"))
 
     def __del__(self):
         self.wait()
@@ -188,10 +186,16 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface):
                          self.populate_devices)
 
         # If we have access to HAL & DBus, intercept some useful signals
-        if hasattr(self.live, 'hal'):
-            self.live.hal.connect_to_signal('DeviceAdded',
+#        if hasattr(self.live, 'hal'):
+#            self.live.i.connect_to_signal('DeviceAdded',
+#                                            self.populate_devices)
+#            self.live.hal.connect_to_signal('DeviceRemoved',
+#                                            self.populate_devices)
+        # If we have access to UDisk & DBus, intercept some useful signals
+        if hasattr(self.live, 'iface'):
+            self.live.iface.connect_to_signal('DeviceAdded',
                                             self.populate_devices)
-            self.live.hal.connect_to_signal('DeviceRemoved',
+            self.live.iface.connect_to_signal('DeviceRemoved',
                                             self.populate_devices)
 
     def progress(self, value):
@@ -245,7 +249,7 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface):
             try:
                 self.live.set_iso(isofile)
                 
-            except Exception, e:
+            except Exception as e:
                 self.live.log.error(e.message.encode('utf8'))
                 self.status(_("Unable to encode the filename of your livecd.  "
                               "You may have better luck if you move your ISO "