liveusb/creator.py | 23 +++++------------------ liveusb/gui.py | 22 ++++++++++++---------- 2 files changed, 17 insertions(+), 28 deletions(-)

New commits: commit 15b403f5bc583381bf6c470889dcfe96575a3b55 Author: Luke Macken lmacken@redhat.com Date: Fri Jan 2 18:17:09 2009 -0500

Actually disable the usb-zip feature, for now

diff --git a/liveusb/gui.py b/liveusb/gui.py index 0149a0e..8d73e74 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -152,16 +152,16 @@ class LiveUSBThread(QtCore.QThread): now = datetime.now() try: # Initialize zip-drive-compatible geometry - if self.parent.opts.zip: - self.live.dest = self.live.drive['mount'] - self.live.drive['unmount'] = True - self.live.unmount_device() - self.live.initialize_zip_geometry() - self.live.drive = self.parent.get_selected_drive() - self.live.dest = self.live.drive['mount'] - self.live.drive['unmount'] = True - self.live.unmount_device() - self.live.format_device() + #if self.parent.opts.zip: + # self.live.dest = self.live.drive['mount'] + # self.live.drive['unmount'] = True + # self.live.unmount_device() + # self.live.initialize_zip_geometry() + # self.live.drive = self.parent.get_selected_drive() + # self.live.dest = self.live.drive['mount'] + # self.live.drive['unmount'] = True + # self.live.unmount_device() + # self.live.format_device()

self.live.verify_filesystem() if not self.live.drive['uuid'] and not self.live.label:

commit 051a346c7979263980b9e910f69e87ec2d69fe24 Author: Luke Macken lmacken@redhat.com Date: Fri Jan 2 18:16:51 2009 -0500

Fix our syslinux directory path for Windows

diff --git a/liveusb/creator.py b/liveusb/creator.py index b04528a..025e0bd 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -738,8 +738,7 @@ class WindowsLiveUSBCreator(LiveUSBCreator): os.unlink(os.path.join(device + os.path.sep, "syslinux", "isolinux.cfg")) self.popen('syslinux%s%s -m -a -d %s %s' % (self.opts.force and ' -f' - or ' ', self.opts.safe and ' -s' or ' ', - os.path.join(device + os.path.sep, 'syslinux'), device)) + or ' ', self.opts.safe and ' -s' or ' ', 'syslinux', device))

def _get_device_uuid(self, drive): """ Return the UUID of our selected drive """

commit c2bedae94db4b4b46e4eb62bf074628eeedf357d Author: Luke Macken lmacken@redhat.com Date: Fri Jan 2 18:16:23 2009 -0500

Fix some windows logger issues. If we're not in verbose mode, then remove the StreamHandler, as this will cause extra noise in windows.

diff --git a/liveusb/creator.py b/liveusb/creator.py index 178347c..b04528a 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -76,11 +76,11 @@ class LiveUSBCreator(object): if self.opts.verbose: level = logging.DEBUG self.log.setLevel(level) - handler = logging.StreamHandler() - handler.setLevel(level) + self.handler = logging.StreamHandler() + self.handler.setLevel(level) formatter = logging.Formatter("[%(module)s:%(lineno)s] %(message)s") - handler.setFormatter(formatter) - self.log.addHandler(handler) + self.handler.setFormatter(formatter) + self.log.addHandler(self.handler)

def detect_removable_drives(self): """ This method should populate self.drives with removable devices """ @@ -651,18 +651,6 @@ class LinuxLiveUSBCreator(LiveUSBCreator):

class WindowsLiveUSBCreator(LiveUSBCreator):

- def _setup_logger(self): - self.log = logging.getLogger(__name__) - level = logging.INFO - if self.opts.verbose: - level = logging.DEBUG - handler = logging.StreamHandler() - handler.setLevel(level) - formatter = logging.Formatter("[%(module)s:%(lineno)s] %(message)s") - handler.setFormatter(formatter) - self.log.addHandler(handler) - self.log.setLevel(level) - def detect_removable_drives(self): import win32file, win32api self.drives = {} diff --git a/liveusb/gui.py b/liveusb/gui.py index 6dc5837..0149a0e 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -251,6 +251,8 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): # Intercept all liveusb INFO log messages, and display them in the gui self.handler = LiveUSBLogHandler(lambda x: self.textEdit.append(x)) self.live.log.addHandler(self.handler) + if not self.opts.verbose: + self.live.log.removeHandler(self.live.handler)

def populate_devices(self, *args, **kw): if self.in_process: