liveusb-creator April 2013

liveusb-creator@lists.fedorahosted.org

2 participants
3 discussions

[ANNOUNCE] liveusb-creator 3.11.8
by Luke Macken 30 Apr '13

30 Apr '13

[ Changes ] • Fixed EFI booting • Added a button for refreshing the release list • Fixed translations under Windows • Modernized installer style and translated it approprately • Built with Python 2.7 (previous versions were built with 2.5) • Fixed a bug that prevented persistent overlays from working • Improvements and bugfixes to the maximum overlay sizing code • Handle devices without any free space • Fixed bugs with handling devices with non-ascii labels • A variety of other bugfixes and improvements [ Download ] • Source: https://fedorahosted.org/releases/l/i/liveusb-creator/liveusb-creator-3.11.… SHA1: 1ca8d1de3f86f616b1a27c16cb046f9cb519787f • Windows: https://fedorahosted.org/releases/l/i/liveusb-creator/liveusb-creator-3.11.… SHA1: b31ec3a6b241779fc0ea08211cf2b90b2b8f8808 [ Links ] • Homepage: http://liveusb-creator.fedorahosted.org • GitHub: https://github.com/lmacken/liveusb-creator

1 0

26 commits - data/liveusb-creator.nsi data/liveusb-creator.nsi.in liveusb-creator liveusb/creator.py liveusb/gui.py liveusb/windows_dialog.py setup.py tests/test_creator.py
by Luke Macken 30 Apr '13

30 Apr '13

data/liveusb-creator.nsi | 4 - data/liveusb-creator.nsi.in | 6 - liveusb-creator | 4 - liveusb/creator.py | 61 +++++++++++--------- liveusb/gui.py | 60 +++++++++++++------ liveusb/windows_dialog.py | 133 +++++++++++++++++++++++++------------------- setup.py | 4 - tests/test_creator.py | 4 - 8 files changed, 167 insertions(+), 109 deletions(-) New commits: commit 3753af309bb797c4593799e69af0f4094a4d0a6b Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Apr 23 13:58:02 2013 -0400 Add mswsock.dll to the py2exe dll_excludes to fix an error diff --git a/setup.py b/setup.py index 7d0b526..7f32bad 100644 --- a/setup.py +++ b/setup.py @@ -62,8 +62,10 @@ if sys.platform == 'win32': #"includes" : ["sip", "PyQt4._qt"], "includes" : ["sip"], 'bundle_files': 1, + # http://stackoverflow.com/questions/1439621/problem-with-loading-win32file-p… + "dll_excludes": ["mswsock.dll", "MSWSOCK.dll"], } - }, + }, zipfile=None, data_files = [ "LICENSE.txt", commit b1d2e14a4b180cce3d081caf08da0ba43e213c4d Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Apr 23 13:54:52 2013 -0400 Revert "Update our win32 syslinux binary to 5.01". We can't do this until Fedora uses syslinux 5.x, as we are still stuck on 4. diff --git a/tools/syslinux.exe b/tools/syslinux.exe index 0e25655..a67dc0d 100644 Binary files a/tools/syslinux.exe and b/tools/syslinux.exe differ commit 97b810886e9e4349885c9bf93f3b08502124059f Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Apr 23 13:05:02 2013 -0400 Generate a fresh windows_dialog.py with the new release refresher button diff --git a/liveusb/windows_dialog.py b/liveusb/windows_dialog.py index d9e28c8..f25a459 100644 --- a/liveusb/windows_dialog.py +++ b/liveusb/windows_dialog.py @@ -2,120 +2,141 @@ # Form implementation generated from reading ui file 'data/liveusb-creator.ui' # -# Created: Wed Sep 3 03:31:13 2008 -# by: PyQt4 UI code generator 4.4.2 +# Created: Tue Apr 23 13:03:23 2013 +# by: PyQt4 UI code generator 4.10 # # WARNING! All changes made in this file will be lost! from PyQt4 import QtCore, QtGui -from liveusb import utf8_gettext as _ + +try: + _fromUtf8 = QtCore.QString.fromUtf8 +except AttributeError: + def _fromUtf8(s): + return s + +try: + _encoding = QtGui.QApplication.UnicodeUTF8 + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig, _encoding) +except AttributeError: + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig) class Ui_Dialog(object): def setupUi(self, Dialog): - Dialog.setObjectName("Dialog") - Dialog.resize(422,388) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed) + Dialog.setObjectName(_fromUtf8("Dialog")) + Dialog.resize(422, 388) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(Dialog.sizePolicy().hasHeightForWidth()) Dialog.setSizePolicy(sizePolicy) self.startButton = QtGui.QPushButton(Dialog) self.startButton.setEnabled(True) - self.startButton.setGeometry(QtCore.QRect(130,350,158,34)) - self.startButton.setObjectName("startButton") + self.startButton.setGeometry(QtCore.QRect(130, 350, 158, 34)) + self.startButton.setObjectName(_fromUtf8("startButton")) self.textEdit = QtGui.QTextEdit(Dialog) - self.textEdit.setGeometry(QtCore.QRect(10,200,401,111)) + self.textEdit.setGeometry(QtCore.QRect(10, 200, 401, 111)) font = QtGui.QFont() font.setPointSize(8) self.textEdit.setFont(font) self.textEdit.setReadOnly(True) - self.textEdit.setObjectName("textEdit") + self.textEdit.setObjectName(_fromUtf8("textEdit")) self.progressBar = QtGui.QProgressBar(Dialog) - self.progressBar.setGeometry(QtCore.QRect(10,320,401,23)) - self.progressBar.setProperty("value",QtCore.QVariant(0)) - self.progressBar.setObjectName("progressBar") + self.progressBar.setGeometry(QtCore.QRect(10, 320, 401, 23)) + self.progressBar.setProperty("value", 0) + self.progressBar.setObjectName(_fromUtf8("progressBar")) self.downloadGroup = QtGui.QGroupBox(Dialog) - self.downloadGroup.setGeometry(QtCore.QRect(210,80,201,51)) + self.downloadGroup.setGeometry(QtCore.QRect(210, 80, 201, 51)) font = QtGui.QFont() font.setPointSize(8) self.downloadGroup.setFont(font) - self.downloadGroup.setObjectName("downloadGroup") + self.downloadGroup.setObjectName(_fromUtf8("downloadGroup")) self.downloadCombo = QtGui.QComboBox(self.downloadGroup) - self.downloadCombo.setGeometry(QtCore.QRect(10,20,181,22)) - self.downloadCombo.setObjectName("downloadCombo") + self.downloadCombo.setGeometry(QtCore.QRect(10, 20, 161, 22)) + self.downloadCombo.setObjectName(_fromUtf8("downloadCombo")) + self.refreshReleasesButton = QtGui.QPushButton(self.downloadGroup) + self.refreshReleasesButton.setGeometry(QtCore.QRect(170, 20, 30, 20)) + self.refreshReleasesButton.setText(_fromUtf8("")) + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/refresh.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.refreshReleasesButton.setIcon(icon) + self.refreshReleasesButton.setFlat(True) + self.refreshReleasesButton.setObjectName(_fromUtf8("refreshReleasesButton")) self.label_2 = QtGui.QLabel(Dialog) - self.label_2.setGeometry(QtCore.QRect(180,100,23,24)) + self.label_2.setGeometry(QtCore.QRect(180, 100, 23, 24)) font = QtGui.QFont() - font.setFamily("Verdana") + font.setFamily(_fromUtf8("Verdana")) font.setPointSize(10) - font.setWeight(75) font.setBold(True) + font.setWeight(75) self.label_2.setFont(font) - self.label_2.setObjectName("label_2") + self.label_2.setObjectName(_fromUtf8("label_2")) self.groupBox = QtGui.QGroupBox(Dialog) - self.groupBox.setGeometry(QtCore.QRect(10,80,161,51)) + self.groupBox.setGeometry(QtCore.QRect(10, 80, 161, 51)) font = QtGui.QFont() font.setPointSize(8) self.groupBox.setFont(font) - self.groupBox.setObjectName("groupBox") + self.groupBox.setObjectName(_fromUtf8("groupBox")) self.isoBttn = QtGui.QPushButton(self.groupBox) - self.isoBttn.setGeometry(QtCore.QRect(11,18,141,25)) - self.isoBttn.setObjectName("isoBttn") + self.isoBttn.setGeometry(QtCore.QRect(11, 18, 141, 25)) + self.isoBttn.setObjectName(_fromUtf8("isoBttn")) self.groupBox_2 = QtGui.QGroupBox(Dialog) - self.groupBox_2.setGeometry(QtCore.QRect(10,140,191,51)) + self.groupBox_2.setGeometry(QtCore.QRect(10, 140, 191, 51)) font = QtGui.QFont() font.setPointSize(8) self.groupBox_2.setFont(font) - self.groupBox_2.setObjectName("groupBox_2") + self.groupBox_2.setObjectName(_fromUtf8("groupBox_2")) self.driveBox = QtGui.QComboBox(self.groupBox_2) - self.driveBox.setGeometry(QtCore.QRect(10,20,145,20)) + self.driveBox.setGeometry(QtCore.QRect(10, 20, 151, 21)) self.driveBox.setEditable(False) self.driveBox.setInsertPolicy(QtGui.QComboBox.InsertAtTop) self.driveBox.setDuplicatesEnabled(False) - self.driveBox.setObjectName("driveBox") + self.driveBox.setObjectName(_fromUtf8("driveBox")) self.refreshDevicesButton = QtGui.QPushButton(self.groupBox_2) - self.refreshDevicesButton.setGeometry(QtCore.QRect(156,16,30,26)) - icon = QtGui.QIcon() - icon.addFile(":/refresh.png") + self.refreshDevicesButton.setGeometry(QtCore.QRect(160, 20, 30, 20)) + self.refreshDevicesButton.setText(_fromUtf8("")) self.refreshDevicesButton.setIcon(icon) self.refreshDevicesButton.setFlat(True) - self.refreshDevicesButton.setObjectName("refreshDevicesButton") + self.refreshDevicesButton.setObjectName(_fromUtf8("refreshDevicesButton")) self.overlayTitle = QtGui.QGroupBox(Dialog) - self.overlayTitle.setGeometry(QtCore.QRect(210,140,201,51)) + self.overlayTitle.setGeometry(QtCore.QRect(210, 140, 201, 51)) font = QtGui.QFont() font.setPointSize(8) self.overlayTitle.setFont(font) - self.overlayTitle.setObjectName("overlayTitle") + self.overlayTitle.setObjectName(_fromUtf8("overlayTitle")) self.overlaySlider = QtGui.QSlider(self.overlayTitle) - self.overlaySlider.setGeometry(QtCore.QRect(10,20,181,21)) + self.overlaySlider.setGeometry(QtCore.QRect(10, 20, 181, 21)) self.overlaySlider.setMaximum(2047) self.overlaySlider.setOrientation(QtCore.Qt.Horizontal) self.overlaySlider.setTickPosition(QtGui.QSlider.NoTicks) - self.overlaySlider.setObjectName("overlaySlider") + self.overlaySlider.setObjectName(_fromUtf8("overlaySlider")) self.label = QtGui.QLabel(Dialog) - self.label.setGeometry(QtCore.QRect(0,0,430,72)) - self.label.setPixmap(QtGui.QPixmap(":/liveusb-header.png")) - self.label.setObjectName("label") + self.label.setGeometry(QtCore.QRect(0, 0, 430, 72)) + self.label.setText(_fromUtf8("")) + self.label.setPixmap(QtGui.QPixmap(_fromUtf8(":/liveusb-header.png"))) + self.label.setObjectName(_fromUtf8("label")) self.retranslateUi(Dialog) QtCore.QMetaObject.connectSlotsByName(Dialog) def retranslateUi(self, Dialog): - Dialog.setWindowTitle(QtGui.QApplication.translate("Dialog", _("Fedora LiveUSB Creator"), None, QtGui.QApplication.UnicodeUTF8)) - self.startButton.setWhatsThis(QtGui.QApplication.translate("Dialog", _("This button will begin the LiveUSB creation process. This entails optionally downloading a release (if an existing one wasn\'t selected), extracting the ISO to the USB device, creating the persistent overlay, and installing the bootloader."), None, QtGui.QApplication.UnicodeUTF8)) - self.startButton.setText(QtGui.QApplication.translate("Dialog", _("Create Live USB"), None, QtGui.QApplication.UnicodeUTF8)) - self.textEdit.setWhatsThis(QtGui.QApplication.translate("Dialog", _("This is the status console, where all messages get written to."), None, QtGui.QApplication.UnicodeUTF8)) - self.progressBar.setWhatsThis(QtGui.QApplication.translate("Dialog", _("This is the progress bar that will indicate how far along in the LiveUSB creation process you are"), None, QtGui.QApplication.UnicodeUTF8)) - self.downloadGroup.setWhatsThis(QtGui.QApplication.translate("Dialog", _("If you do not select an existing Live CD, the selected release will be downloaded for you."), None, QtGui.QApplication.UnicodeUTF8)) - self.downloadGroup.setTitle(QtGui.QApplication.translate("Dialog", _("Download Fedora"), None, QtGui.QApplication.UnicodeUTF8)) - self.label_2.setText(QtGui.QApplication.translate("Dialog", _("or"), None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox.setWhatsThis(QtGui.QApplication.translate("Dialog", _("This button allows you to browse for an existing Live CD ISO that you have previously downloaded. If you do not select one, a release will be downloaded for you automatically."), None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox.setTitle(QtGui.QApplication.translate("Dialog", _("Use existing Live CD"), None, QtGui.QApplication.UnicodeUTF8)) - self.isoBttn.setText(QtGui.QApplication.translate("Dialog", _("Browse"), None, QtGui.QApplication.UnicodeUTF8)) - self.isoBttn.setShortcut(QtGui.QApplication.translate("Dialog", "Alt+B", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_2.setWhatsThis(QtGui.QApplication.translate("Dialog", _("This is the USB stick that you want to install your Live CD on. This device must be formatted with the FAT filesystem."), None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_2.setTitle(QtGui.QApplication.translate("Dialog", _("Target Device"), None, QtGui.QApplication.UnicodeUTF8)) - self.overlayTitle.setWhatsThis(QtGui.QApplication.translate("Dialog", _("By allocating extra space on your USB stick for a persistent overlay, you will be able to store data and make permanent modifications to your live operating system. Without it, you will not be able to save data that will persist after a reboot."), None, QtGui.QApplication.UnicodeUTF8)) - self.overlayTitle.setTitle(QtGui.QApplication.translate("Dialog", _("Persistent Storage (0 Mb)"), None, QtGui.QApplication.UnicodeUTF8)) + Dialog.setWindowTitle(_translate("Dialog", "Fedora LiveUSB Creator", None)) + self.startButton.setWhatsThis(_translate("Dialog", "This button will begin the LiveUSB creation process. This entails optionally downloading a release (if an existing one wasn\'t selected), extracting the ISO to the USB device, creating the persistent overlay, and installing the bootloader.", None)) + self.startButton.setText(_translate("Dialog", "Create Live USB", None)) + self.textEdit.setWhatsThis(_translate("Dialog", "This is the status console, where all messages get written to.", None)) + self.progressBar.setWhatsThis(_translate("Dialog", "This is the progress bar that will indicate how far along in the LiveUSB creation process you are", None)) + self.downloadGroup.setWhatsThis(_translate("Dialog", "If you do not select an existing Live CD, the selected release will be downloaded for you.", None)) + self.downloadGroup.setTitle(_translate("Dialog", "Download Fedora", None)) + self.label_2.setText(_translate("Dialog", "or", None)) + self.groupBox.setWhatsThis(_translate("Dialog", "This button allows you to browse for an existing Live CD ISO that you have previously downloaded. If you do not select one, a release will be downloaded for you automatically.", None)) + self.groupBox.setTitle(_translate("Dialog", "Use existing Live CD", None)) + self.isoBttn.setText(_translate("Dialog", "Browse", None)) + self.isoBttn.setShortcut(_translate("Dialog", "Alt+B", None)) + self.groupBox_2.setWhatsThis(_translate("Dialog", "This is the USB stick that you want to install your Live CD on. This device must be formatted with the FAT filesystem.", None)) + self.groupBox_2.setTitle(_translate("Dialog", "Target Device", None)) + self.overlayTitle.setWhatsThis(_translate("Dialog", "By allocating extra space on your USB stick for a persistent overlay, you will be able to store data and make permanent modifications to your live operating system. Without it, you will not be able to save data that will persist after a reboot.", "comment!")) + self.overlayTitle.setTitle(_translate("Dialog", "Persistent Storage (0 MB)", None)) import resources_rc commit c8f0e02686560e2df23976c7b6b9df2cd8284c21 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Apr 23 13:00:39 2013 -0400 Bump the version in our nsi configs diff --git a/data/liveusb-creator.nsi b/data/liveusb-creator.nsi index 03f3760..9f6aefd 100644 --- a/data/liveusb-creator.nsi +++ b/data/liveusb-creator.nsi @@ -1,5 +1,5 @@ -Name "LiveUSB Creator 3.11.7" -OutFile "liveusb-creator-3.11.7-setup.exe" +Name "LiveUSB Creator 3.11.8" +OutFile "liveusb-creator-3.11.8-setup.exe" !include "MUI2.nsh" XPStyle on diff --git a/data/liveusb-creator.nsi.in b/data/liveusb-creator.nsi.in index 943c3fb..8beba06 100755 --- a/data/liveusb-creator.nsi.in +++ b/data/liveusb-creator.nsi.in @@ -1,8 +1,8 @@ ;-------------------------------- -;LiveUSB Crator NSIS script +;LiveUSB Creator NSIS script -Name "LiveUSB Creator 3.11.6" -OutFile "liveusb-creator-3.11.6-setup.exe" +Name "LiveUSB Creator 3.11.8" +OutFile "liveusb-creator-3.11.8-setup.exe" SetCompressor lzma commit 908a88e6f7718aadedf7c5ea1489bf20e28199fa Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Apr 23 12:57:55 2013 -0400 Update our win32 syslinux binary to 5.01 diff --git a/tools/syslinux.exe b/tools/syslinux.exe index a67dc0d..0e25655 100644 Binary files a/tools/syslinux.exe and b/tools/syslinux.exe differ commit b02357283f34d63d7fe2c27b55fcb8bca233c0ff Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Apr 23 12:55:25 2013 -0400 Change our overlay restriciton warnings to debug messages This ensures that windows users don't always get an error dialog popup upon completion. diff --git a/liveusb/gui.py b/liveusb/gui.py index d6deecd..659516e 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -412,12 +412,12 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): current_overlay = self.overlaySlider.value() if device['fsversion'] == 'FAT32': - self.live.log.warning(_('Partition is FAT32; Restricting overlay ' - 'size to 4G')) + self.live.log.debug(_('Partition is FAT32; Restricting overlay ' + 'size to 4G')) max_space = MAX_FAT32 elif device['fsversion'] == 'FAT16': - self.live.log.warning(_('Partition is FAT16; Restricting overlay ' - 'size to 2G')) + self.live.log.debug(_('Partition is FAT16; Restricting overlay ' + 'size to 2G')) max_space = MAX_FAT16 else: max_space = MAX_EXT commit 4edb6f9f2a418977295755e572bab0517ff50e8c Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Apr 23 12:55:12 2013 -0400 Show warnings in the gui diff --git a/liveusb/gui.py b/liveusb/gui.py index e1491d4..d6deecd 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -261,7 +261,7 @@ class LiveUSBLogHandler(logging.Handler): self.cb = cb def emit(self, record): - if record.levelname in ('INFO', 'ERROR'): + if record.levelname in ('INFO', 'ERROR', 'WARN'): self.cb(record.msg) commit 496e58cf4e9e1a1ed4a812b976f44e8c113fa7ef Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Apr 22 15:13:21 2013 -0400 Stop our progress thread before unmounting diff --git a/liveusb/gui.py b/liveusb/gui.py index fb0d677..e1491d4 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -130,6 +130,7 @@ class ProgressThread(QtCore.QThread): orig_free = 0 drive = None get_free_bytes = None + alive = True def set_data(self, size, drive, freebytes): self.totalsize = size / 1024 @@ -139,7 +140,7 @@ class ProgressThread(QtCore.QThread): self.emit(QtCore.SIGNAL("maxprogress(int)"), self.totalsize) def run(self): - while True: + while self.alive: free = self.get_free_bytes() value = (self.orig_free - free) / 1024 self.emit(QtCore.SIGNAL("progress(int)"), value) @@ -147,6 +148,9 @@ class ProgressThread(QtCore.QThread): break sleep(3) + def stop(self): + self.alive = False + def terminate(self): self.emit(QtCore.SIGNAL("progress(int)"), self.totalsize) QtCore.QThread.terminate(self) @@ -223,6 +227,8 @@ class LiveUSBThread(QtCore.QThread): if self.parent.opts.liveos_checksum: self.live.calculate_liveos_checksum() + self.progress.stop() + # Flush all filesystem buffers and unmount self.live.flush_buffers() self.live.unmount_device() @@ -302,12 +308,12 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): 'the Properties. Under the Compatibility tab, check the "Run ' 'this program as an administrator" box.')) - def populate_devices(self, *args, **kw): if self.in_process: return self.driveBox.clear() #self.textEdit.clear() + def add_devices(): if not len(self.live.drives): self.textEdit.setPlainText(_("Unable to find any USB drives")) commit ea484684e7adb158d8dd59319f02d963a76ca57b Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Apr 22 14:46:09 2013 -0400 Enable verbose logging during our tests diff --git a/tests/test_creator.py b/tests/test_creator.py index 06cfb21..e07c876 100644 --- a/tests/test_creator.py +++ b/tests/test_creator.py @@ -5,7 +5,7 @@ class LiveUSBCreatorOptions(object): force = False safe = False noverify = False - verbose = False + verbose = True class TestLiveUSBCreator: commit 185994c4389f7ba1cf39ce63662007ac4bfb8d32 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Apr 22 14:45:57 2013 -0400 Log exceptions when trying to clean up our processes diff --git a/liveusb/creator.py b/liveusb/creator.py index e918c38..7c011b0 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -743,8 +743,8 @@ class LinuxLiveUSBCreator(LiveUSBCreator): try: os.kill(pid, signal.SIGHUP) self.log.debug("Killed process %d" % pid) - except OSError: - pass + except OSError, e: + self.log.debug(str(e)) def verify_iso_md5(self): """ Verify the ISO md5sum. commit 92d4952a9c03e077c5a4032e70d93f1e993b72c5 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Apr 22 14:45:32 2013 -0400 whitespace tweaks and move an import around diff --git a/liveusb/creator.py b/liveusb/creator.py index 55ce830..e918c38 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -29,6 +29,7 @@ import tempfile import logging import hashlib import shutil +import signal import time import os import re @@ -738,7 +739,6 @@ class LinuxLiveUSBCreator(LiveUSBCreator): return dbus.Interface(dev_obj, "org.freedesktop.UDisks.Device") def terminate(self): - import signal for pid in self.pids: try: os.kill(pid, signal.SIGHUP) diff --git a/tests/test_creator.py b/tests/test_creator.py index 8ac8b09..06cfb21 100644 --- a/tests/test_creator.py +++ b/tests/test_creator.py @@ -92,7 +92,7 @@ class TestLiveUSBCreator: from glob import glob live = self._get_creator() live.detect_removable_drives() - isos = filter(lambda x: x.endswith('.iso'), + isos = filter(lambda x: x.endswith('.iso'), filter(os.path.isfile, glob('*') + glob('*/*'))) assert isos, "No ISOs found. Put one in this directory" for drive in live.drives: commit 840dab87bf493e01cdad204768c6f6dd9b798a19 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Apr 22 14:44:40 2013 -0400 Update the copyright diff --git a/liveusb-creator b/liveusb-creator index b390428..e76002a 100755 --- a/liveusb-creator +++ b/liveusb-creator @@ -1,7 +1,7 @@ #!/usr/bin/python -tt # coding: utf-8 # -# Copyright © 2008-2010 Red Hat, Inc. All rights reserved. +# Copyright © 2008-2013 Red Hat, Inc. All rights reserved. # # This copyrighted material is made available to anyone wishing to use, modify, # copy, or redistribute it subject to the terms and conditions of the GNU commit ff88f95b6e427b45898b228756dbdaa3df953cb5 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Mar 1 17:14:21 2013 -0500 More improvements to the maximum overlay size code diff --git a/liveusb/gui.py b/liveusb/gui.py index 537f141..fb0d677 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -50,6 +50,7 @@ except: MAX_FAT16 = 2047 MAX_FAT32 = 3999 +MAX_EXT = 2097152 class LiveUSBApp(QtGui.QApplication): @@ -400,7 +401,8 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): return device = self.live.drives[drive] - freespace = device['free'] or 0 + freespace = device['free'] + device_size = device['size'] / 1024**2 current_overlay = self.overlaySlider.value() if device['fsversion'] == 'FAT32': @@ -412,21 +414,23 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): 'size to 2G')) max_space = MAX_FAT16 else: - max_space = freespace + max_space = MAX_EXT + + if freespace: + if freespace > device_size: + freespace = device_size + if freespace > max_space: + freespace = max_space if not device['mount']: self.live.log.warning(_('Device is not yet mounted, so we cannot ' 'determine the amount of free space.')) - if freespace > max_space: - freespace = max_space + if not freespace: + freespace = device_size else: if not freespace: self.live.log.warning(_('No free space on %s') % drive) freespace = 0 - else: - if device['fsversion'] in ('FAT32', 'FAT16'): - if freespace > max_space: - freespace = max_space # Subtract the size of the ISO from our maximum overlay size if self.live.isosize: commit 80180410d76c4191a4451b029eeee300f4f56886 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Mar 1 13:52:56 2013 -0500 Get persistent overlays working with F18 (#908120) diff --git a/liveusb/creator.py b/liveusb/creator.py index 7f34ab6..55ce830 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -280,12 +280,21 @@ class LiveUSBCreator(object): line) if "isolinux" in line: line = re.sub("isolinux", "syslinux", line) - if self.overlay and "liveimg" in line: - line = line.replace("liveimg", "liveimg overlay=" + usblabel) - line = line.replace(" ro ", " rw ") - if self.opts.kernel_args: - line = line.replace("liveimg", "liveimg %s" % - ' '.join(self.opts.kernel_args.split(','))) + if "liveimg" in line: + if self.overlay: + line = line.replace("liveimg", "liveimg overlay=" + usblabel) + line = line.replace(" ro ", " rw ") + if self.opts.kernel_args: + line = line.replace("liveimg", "liveimg %s" % + ' '.join(self.opts.kernel_args.split(','))) + elif "rd.live.image" in line: + if self.overlay: + line = line.replace("rd.live.image", "rd.live.image " + + "rd.live.overlay=" + usblabel) + line = line.replace(" ro ", " rw ") + if self.opts.kernel_args: + line = line.replace("rd.live.image", "rd.live.image %s" % + ' '.join(self.opts.kernel_args.split(','))) outfile.write(line) infile.close() outfile.close() commit 8bb706d25fe439a8bdaacae9df7354d4fc4f36d6 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Mar 1 13:12:55 2013 -0500 Handle devices without any free space diff --git a/liveusb/gui.py b/liveusb/gui.py index 946f339..537f141 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -400,7 +400,7 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): return device = self.live.drives[drive] - freespace = device['free'] + freespace = device['free'] or 0 current_overlay = self.overlaySlider.value() if device['fsversion'] == 'FAT32': commit 739c8b6fea70ba7a93af2a2422844d53b3a4b8b9 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Mar 1 12:17:14 2013 -0500 Fix another bug with non-ascii device labels (#863064) diff --git a/liveusb/gui.py b/liveusb/gui.py index 98d0e1e..946f339 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -385,9 +385,9 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): 2gigs of free space, set the maximum to 2047mb, which is apparently the largest file we can/should store on a vfat partition. """ - if not str(drive): + if not unicode(drive): return - self._refresh_overlay_slider(str(drive).split()[0]) + self._refresh_overlay_slider(unicode(drive).split()[0]) def _refresh_overlay_slider(self, drive=None): """ commit 5bd8aa7f889f7d6e57d5602fa8c1395663fd668b Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Mar 1 12:07:24 2013 -0500 Handle integers in LiveUSBDialog.status (#820809) diff --git a/liveusb/gui.py b/liveusb/gui.py index 1842834..98d0e1e 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -453,6 +453,8 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): def status(self, text): if isinstance(text, Exception): text = text.args[0] + elif isinstance(text, int): + text = str(text) self.textEdit.append(text) def enable_widgets(self, enabled=True): commit 3f5d67e9c7fcd74c280ea6e6c2ea79eba6e09543 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Mar 1 11:50:38 2013 -0500 Don't display unnecessary warnings (#804) diff --git a/liveusb/gui.py b/liveusb/gui.py index b387d65..1842834 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -501,7 +501,7 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): if self.opts.reset_mbr: self.live.reset_mbr() else: - self.status(_("Warning: The Master Boot Record on your device " + self.live.log.warn(_("Warning: The Master Boot Record on your device " "does not match your system's syslinux MBR. If you " "have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option.")) commit 553b35cf354c47b58adf1a81818fb2d9087acbac Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Mar 1 11:42:30 2013 -0500 Handle non-ascii mount paths (#802) diff --git a/liveusb/creator.py b/liveusb/creator.py index 8dbf2d3..7f34ab6 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -456,7 +456,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator): 'fsversion': str(dev.Get(device, 'IdVersion')), 'uuid': str(dev.Get(device, 'IdUuid')), 'device': str(dev.Get(device, 'DeviceFile')), - 'mount': map(str, list(dev.Get(device, 'DeviceMountPaths'))), + 'mount': map(unicode, list(dev.Get(device, 'DeviceMountPaths'))), 'bootable': 'boot' in map(str, list(dev.Get(device, 'PartitionFlags'))), 'parent': None, commit 1f54d997d0eb69390af232f38f7c6f9c56bfeaf1 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Mar 1 11:28:15 2013 -0500 Limit the overlay size to 3999MB for FAT32 (#619) diff --git a/liveusb/gui.py b/liveusb/gui.py index eb6af73..b387d65 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -48,6 +48,9 @@ try: except: pass +MAX_FAT16 = 2047 +MAX_FAT32 = 3999 + class LiveUSBApp(QtGui.QApplication): """ Main application class """ @@ -400,27 +403,36 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): freespace = device['free'] current_overlay = self.overlaySlider.value() + if device['fsversion'] == 'FAT32': + self.live.log.warning(_('Partition is FAT32; Restricting overlay ' + 'size to 4G')) + max_space = MAX_FAT32 + elif device['fsversion'] == 'FAT16': + self.live.log.warning(_('Partition is FAT16; Restricting overlay ' + 'size to 2G')) + max_space = MAX_FAT16 + else: + max_space = freespace + if not device['mount']: self.live.log.warning(_('Device is not yet mounted, so we cannot ' - 'determine the amount of free space. ' - 'Setting a maximum limit of 8G for the ' - 'persistent storage.')) - freespace = 8192 + 'determine the amount of free space.')) + if freespace > max_space: + freespace = max_space else: if not freespace: self.live.log.warning(_('No free space on %s') % drive) freespace = 0 - - # FAT16 cannot handle files greater than 2G - if device['fsversion'] == 'FAT16': - self.live.log.warning(_('Partition is FAT16; Restricting overlay ' - 'size to 2G')) - if freespace > 2047: - freespace = 2047 + else: + if device['fsversion'] in ('FAT32', 'FAT16'): + if freespace > max_space: + freespace = max_space # Subtract the size of the ISO from our maximum overlay size if self.live.isosize: - freespace -= self.live.isosize / 1024**2 + iso_size = self.live.isosize / 1024**2 + if freespace + iso_size > device['free']: + freespace -= iso_size freespace -= 1 # Don't fill the device 100% commit d705783c7e5c770bbe45000916311121540faac8 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Mar 1 11:26:25 2013 -0500 Change isolinux to syslinux in the grub.cfg (#810112) diff --git a/liveusb/creator.py b/liveusb/creator.py index f6bd5e0..8dbf2d3 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -278,6 +278,8 @@ class LiveUSBCreator(object): line = re.sub("rootfstype=[^ ]*", "rootfstype=%s" % self.fstype, line) + if "isolinux" in line: + line = re.sub("isolinux", "syslinux", line) if self.overlay and "liveimg" in line: line = line.replace("liveimg", "liveimg overlay=" + usblabel) line = line.replace(" ro ", " rw ") commit 59fe5dcb2ea11763090eabd3c130241e7c4b2c83 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Mar 1 11:25:54 2013 -0500 Always refer to the label LIVE instead of the device UUID (#809) diff --git a/liveusb/creator.py b/liveusb/creator.py index 881c90b..f6bd5e0 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -271,10 +271,10 @@ class LiveUSBCreator(object): def _update_configs(self, infile, outfile): infile = file(infile, 'r') outfile= file(outfile, 'w') - usblabel = self.uuid and 'UUID=' + self.uuid or 'LABEL=' + self.label + usblabel = 'LABEL=' + self.label for line in infile.readlines(): - if "CDLABEL" in line: - line = re.sub("CDLABEL=[^ ]*", usblabel, line) + if "LABEL" in line: + line = re.sub("LABEL=[^ ]*", usblabel, line) line = re.sub("rootfstype=[^ ]*", "rootfstype=%s" % self.fstype, line) commit d96fd49de46b01fe65576a036b8597bc859996ec Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Mar 1 11:24:54 2013 -0500 /EFI/boot/grub.conf has been renamed to /EFI/BOOT/grub.cfg diff --git a/liveusb/creator.py b/liveusb/creator.py index 6dae7b0..881c90b 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -290,10 +290,10 @@ class LiveUSBCreator(object): def update_configs(self): """ Generate our syslinux.cfg and grub.conf files """ - grubconf = os.path.join(self.dest, "EFI", "boot", "grub.conf") - bootconf = os.path.join(self.dest, "EFI", "boot", "boot.conf") - bootx64conf = os.path.join(self.dest, "EFI", "boot", "bootx64.conf") - bootia32conf = os.path.join(self.dest, "EFI", "boot", "bootia32.conf") + grubconf = os.path.join(self.dest, "EFI", "BOOT", "grub.cfg") + bootconf = os.path.join(self.dest, "EFI", "BOOT", "boot.conf") + bootx64conf = os.path.join(self.dest, "EFI", "BOOT", "bootx64.conf") + bootia32conf = os.path.join(self.dest, "EFI", "BOOT", "bootia32.conf") updates = [(os.path.join(self.dest, "isolinux", "isolinux.cfg"), os.path.join(self.dest, "isolinux", "syslinux.cfg")), (grubconf, bootconf)] commit 234e4a34f4c9f8ebcc071677867d76a0e208d2c9 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Mar 1 08:44:31 2013 -0500 whitespace fixes diff --git a/liveusb/creator.py b/liveusb/creator.py index fcbf302..6dae7b0 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -118,7 +118,7 @@ class LiveUSBCreator(object): Platform-specific classes inheriting from the LiveUSBCreator are expected to implement this method to install the bootloader to the - specified device using syslinux. This specific implemention is + specified device using syslinux. This specific implemention is platform independent and performs sanity checking along with adding OLPC support. """ @@ -251,7 +251,7 @@ class LiveUSBCreator(object): self.log.debug('overlaysize = %d' % overlaysize) self.totalsize = overlaysize + self.isosize if self.totalsize > freebytes: - raise LiveUSBError(_("Not enough free space on device." + + raise LiveUSBError(_("Not enough free space on device." + "\n%dMB ISO + %dMB overlay > %dMB free space" % (self.isosize/1024**2, self.overlay, freebytes/1024**2))) @@ -303,7 +303,7 @@ class LiveUSBCreator(object): for (infile, outfile) in updates: if os.path.exists(infile): - self._update_configs(infile,outfile) + self._update_configs(infile, outfile) # only copy/overwrite files we had originally started with for (infile, outfile) in copies: if os.path.exists(outfile): @@ -341,7 +341,7 @@ class LiveUSBCreator(object): out.write(self.output.getvalue()) out.close() return filename - + def existing_liveos(self): return os.path.exists(self.get_liveos()) @@ -738,7 +738,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator): def verify_iso_md5(self): """ Verify the ISO md5sum. - At the moment this is Linux specific, until we port checkisomd5 + At the moment this is Linux specific, until we port checkisomd5 to Windows. """ self.log.info(_('Verifying ISO MD5 checksum')) @@ -1008,7 +1008,7 @@ class WindowsLiveUSBCreator(LiveUSBCreator): if delta.seconds: self.mb_per_sec = (self.isosize / delta.seconds) / 1024**2 if self.mb_per_sec: - self.log.info(_("Wrote to device at") + " %d MB/sec" % + self.log.info(_("Wrote to device at") + " %d MB/sec" % self.mb_per_sec) def install_bootloader(self): commit b371472d63e7f2e4248ec499d9222bac7ad8ae4b Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Mar 1 08:44:03 2013 -0500 Update the copyright diff --git a/liveusb/creator.py b/liveusb/creator.py index bec1ecf..fcbf302 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # -# Copyright © 2008-2010 Red Hat, Inc. All rights reserved. -# Copyright © 2008-2010 Luke Macken <lmacken(a)redhat.com> +# Copyright © 2008-2013 Red Hat, Inc. All rights reserved. +# Copyright © 2008-2013 Luke Macken <lmacken(a)redhat.com> # # This copyrighted material is made available to anyone wishing to use, modify, # copy, or redistribute it subject to the terms and conditions of the GNU commit c7b50c6a02f2003d317e11dddc4e700588c0d147 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Jan 4 13:50:22 2013 -0500 Don't call sys.exit in our __init__ (rhbz#842878) diff --git a/liveusb-creator b/liveusb-creator index 33e2ee6..b390428 100755 --- a/liveusb-creator +++ b/liveusb-creator @@ -40,7 +40,7 @@ def parse_args(): parser.add_option('-v', '--verbose', dest='verbose', action='store_true', help='Output extra debugging messages') parser.add_option('-k', '--extra-kernel-args', dest='kernel_args', - action='store', metavar='ARGS', + action='store', metavar='ARGS', help='Supply extra kernel arguments' ' (eg: -k noswap,selinux=0,elevator=noop)') parser.add_option('-x', '--no-xo', dest='xo', action='store_false',

1 0

Changes to 'refs/tags/3.11.8'
by Luke Macken 30 Apr '13

30 Apr '13

Changes since 3.11.4: Jean-François Fortin Tam (1): Use the power of unicode to avoid choking on French partitions Luke Macken (53): Fix our error message when we can't find any USB drives. Fix a bug that occurs on Windows when installed to a non-default location. Allow an optional callback in our detect_removable_devices method. Change default device label to LIVE Always set the device label to 'LIVE' (#800) 3.11.5 Update our release list for F16 3.11.6 More version bumpage Actually use the correct version Remove the sfx file from the windows build Update the get_releases script to point to the new mirror location Update the Fedora release URLs Add the latest Sugar on a Stick release Add f17, remove f15 3.11.7 bump our nsi version Get our translations working properly under Windows. [ticket:806] Modernize our installer style and translate it appropriately [ticket:808] Don't call sys.exit in our __init__ (rhbz#842878) F18 live images are under i386 now Add a button for refreshing the list of releases Add f18 to our hardcoded release list Update the copyright Enable the close button (issue #3) Apply a patch from ivanromanov to fix non-ascii file names ([ticket:631]) Bump version to 3.11.8 Merge branch 'release/3.11.8' into develop Update the copyright whitespace fixes /EFI/boot/grub.conf has been renamed to /EFI/BOOT/grub.cfg Always refer to the label LIVE instead of the device UUID (#809) Change isolinux to syslinux in the grub.cfg (#810112) Limit the overlay size to 3999MB for FAT32 (#619) Handle non-ascii mount paths (#802) Don't display unnecessary warnings (#804) Handle integers in LiveUSBDialog.status (#820809) Fix another bug with non-ascii device labels (#863064) Handle devices without any free space Get persistent overlays working with F18 (#908120) More improvements to the maximum overlay size code Update the copyright whitespace tweaks and move an import around Log exceptions when trying to clean up our processes Enable verbose logging during our tests Stop our progress thread before unmounting Show warnings in the gui Change our overlay restriciton warnings to debug messages Update our win32 syslinux binary to 5.01 Bump the version in our nsi configs Generate a fresh windows_dialog.py with the new release refresher button Revert "Update our win32 syslinux binary to 5.01". Add mswsock.dll to the py2exe dll_excludes to fix an error --- data/liveusb-creator.nsi | 105 +++++++++++++++++++++++-- data/liveusb-creator.nsi.in | 10 +- data/liveusb-creator.ui | 180 ++++++++++++++++++++++++-------------------- get_releases.py | 10 +- liveusb-creator | 16 ++- liveusb-creator.spec | 11 ++ liveusb/__init__.py | 13 --- liveusb/creator.py | 95 ++++++++++++----------- liveusb/gui.py | 95 ++++++++++++++++------- liveusb/linux_dialog.py | 129 +++++++++++++++++++------------ liveusb/releases.py | 148 ++++++++++++++++++++++-------------- liveusb/windows_dialog.py | 133 ++++++++++++++++++-------------- release.bat | 12 ++ setup.py | 12 +- tests/test_creator.py | 4 15 files changed, 622 insertions(+), 351 deletions(-) ---

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

liveusb-creator April 2013