3 commits - liveusb/creator.py liveusb/gui.py

Luke Macken lmacken at fedoraproject.org
Tue Dec 1 16:56:08 UTC 2009


 liveusb/creator.py |    9 ++++++---
 liveusb/gui.py     |    3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 31d24ff37f60a3d8a09e0f473026527f6a32a57f
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Dec 1 11:54:52 2009 -0500

    Make a note that unmounting after completion can sometimes cause DBus to segfault.

diff --git a/liveusb/gui.py b/liveusb/gui.py
index a63cbd4..f5587e9 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -205,6 +205,9 @@ class LiveUSBThread(QtCore.QThread):
             if self.parent.opts.liveos_checksum:
                 self.live.calculate_liveos_checksum()
 
+            # This sometimes causes segfaults in dbus.
+            #self.live.unmount_device()
+
             duration = str(datetime.now() - now).split('.')[0]
             self.status(_("Complete! (%s)" % duration))
 


commit 9c4f0782c7dca2e00256da298b4a037521689c1f
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Dec 1 11:54:32 2009 -0500

    Make another string translatable

diff --git a/liveusb/creator.py b/liveusb/creator.py
index adbf6a4..1994296 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -707,7 +707,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
             return
         if partition.isFlagAvailable(parted.PARTITION_BOOT):
             if partition.getFlag(parted.PARTITION_BOOT):
-                self.log.debug('%s already bootable' % self._drive)
+                self.log.debug(_('%s already bootable') % self._drive)
             else:
                 partition.setFlag(parted.PARTITION_BOOT)
                 try:


commit 3f8586d266b82cc6c9c100963e7f7d55774a45f1
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Dec 1 11:53:09 2009 -0500

    Make our pyparted usage more robust (Kingson DataTraveller workaround).
    
    For some reason calling disk.commit() to mark a partition as bootable fails on
    Kingson DataTravellers with a "Cannot commit to disk" DiskException.  However,
    the partition is successfully marked as bootable after this error, so we should
    make sure this error isn't fatal, but make the exception available for further
    debugging.

diff --git a/liveusb/creator.py b/liveusb/creator.py
index aad13ba..adbf6a4 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -710,8 +710,11 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
                 self.log.debug('%s already bootable' % self._drive)
             else:
                 partition.setFlag(parted.PARTITION_BOOT)
-                disk.commit()
-                self.log.info('Marked %s as bootable' % self._drive)
+                try:
+                    disk.commit()
+                    self.log.info('Marked %s as bootable' % self._drive)
+                except Exception, e:
+                    self.log.exception(e)
         else:
             self.log.warning('%s does not have boot flag' % self._drive)
 




More information about the liveusb-creator mailing list