liveusb-creator | 2 +- liveusb-creator.spec | 5 ++++- liveusb/gui.py | 10 +++++----- setup.py | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-)

New commits: commit 20e3b20f17d64111a5f89525ccddf22d2d9c08d7 Author: Luke Macken lmacken@redhat.com Date: Tue Feb 17 03:47:43 2009 -0500

Revert "Fix some Python2.6 deprecation warnings with regard to the BaseException.message"

This reverts commit e872c822b1363bcfe70bb8049d96552627a4e14f, and potentially resolves bug #480673.

diff --git a/liveusb/gui.py b/liveusb/gui.py index 9ab94d2..0f3b0af 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -203,7 +203,7 @@ class LiveUSBThread(QtCore.QThread): self.status(_("Complete! (%s)" % duration))

except Exception, e: - self.status(str(e)) + self.status(e.message) self.status(_("LiveUSB creation failed!")) self.live.log.exception(e)

@@ -272,7 +272,7 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): self.driveBox.addItem(device) self.startButton.setEnabled(True) except LiveUSBError, e: - self.textEdit.setPlainText(str(e).encode('utf8')) + self.textEdit.setPlainText(e.message.encode('utf8')) self.startButton.setEnabled(False)

def populate_releases(self): @@ -367,7 +367,7 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): try: self.live.mount_device() except LiveUSBError, e: - self.status(str(e)) + self.status(e.message) self.enable_widgets(True) return

@@ -392,7 +392,7 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): try: self.live.delete_liveos() except LiveUSBError, e: - self.status(str(e)) + self.status(e.message) self.live.unmount_device() self.enable_widgets(True) return @@ -440,7 +440,7 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): try: self.live.iso = self._to_unicode(isofile) except Exception, e: - self.live.log.error(str(e).encode('utf8')) + self.live.log.error(e.message.encode('utf8')) self.status(_("Sorry, I'm having trouble encoding the filename " "of your livecd. You may have better luck if " "you move your ISO to the root of your drive "

commit e1e4af2df5ffd8f0017782dcb0c6f73d7ef40fb0 Merge: 648f69b... c3b4ac4... Author: Luke Macken lmacken@redhat.com Date: Tue Feb 17 03:46:37 2009 -0500

Merge branch 'master' of ssh://git.fedorahosted.org/git/liveusb-creator

commit 648f69bd6d83fd9e607b5826fa60675dc6b53e4d Author: Luke Macken lmacken@redhat.com Date: Fri Jan 16 20:55:49 2009 -0500

v3.5

diff --git a/liveusb-creator b/liveusb-creator index da296ec..635e0b1 100755 --- a/liveusb-creator +++ b/liveusb-creator @@ -18,7 +18,7 @@ # # Author(s): Luke Macken lmacken@redhat.com

-__version__ = '3.4' +__version__ = '3.5'

def parse_args(): from optparse import OptionParser diff --git a/liveusb-creator.spec b/liveusb-creator.spec index 5d9e380..c0277c5 100644 --- a/liveusb-creator.spec +++ b/liveusb-creator.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name: liveusb-creator -Version: 3.4 +Version: 3.5 Release: 1%{?dist} Summary: A liveusb creator

@@ -66,6 +66,9 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}

%changelog +* Fri Jan 16 2009 Luke Macken lmacken@redhat.com 3.5-1 +- Update to v3.5 + * Fri Jan 16 2009 Luke Macken lmacken@redhat.com 3.4-1 - Update to 3.4.

diff --git a/setup.py b/setup.py index 509b20b..31929ce 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ if sys.platform == 'win32':

setup( name = 'liveusb-creator', - version = '3.4', + version = '3.5', packages = ['liveusb', 'liveusb/urlgrabber'], scripts = ['liveusb-creator'], license = 'GNU General Public License (GPL)', @@ -55,7 +55,7 @@ if sys.platform == 'win32': else: setup( name = 'liveusb-creator', - version = '3.4', + version = '3.5', packages = ['liveusb'], scripts = ['liveusb-creator'], license = 'GNU General Public License (GPL)',