Branch 'pyparted-1.x' - 3 commits - liveusb-creator liveusb-creator.spec liveusb/gui.py liveusb/releases.py setup.py
Luke Macken
lmacken at fedoraproject.org
Thu Apr 9 14:11:13 UTC 2009
liveusb-creator | 2 +-
liveusb-creator.spec | 5 ++++-
liveusb/gui.py | 2 +-
liveusb/releases.py | 50 +++++++++++++++++++++++++-------------------------
setup.py | 4 ++--
5 files changed, 33 insertions(+), 30 deletions(-)
New commits:
commit 0307bf1e4fd0b9c8c40ce3c5080ad74598465230
Author: Luke Macken <lmacken at redhat.com>
Date: Thu Apr 9 09:59:34 2009 -0400
v3.6.5
diff --git a/liveusb-creator b/liveusb-creator
index 72bb80c..d518be2 100755
--- a/liveusb-creator
+++ b/liveusb-creator
@@ -18,7 +18,7 @@
#
# Author(s): Luke Macken <lmacken at redhat.com>
-__version__ = '3.6.4'
+__version__ = '3.6.5'
def parse_args():
from optparse import OptionParser
diff --git a/liveusb-creator.spec b/liveusb-creator.spec
index ec2fcd7..597847d 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.6.4
+Version: 3.6.5
Release: 1%{?dist}
Summary: A liveusb creator
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
%changelog
+* Thu Apr 09 2009 Luke Macken <lmacken at redhat.com> 3.6.5-1
+- Update to v3.6.5, which supports F11 beta, and the latest SoaS releases
+
* Wed Mar 18 2009 Luke Macken <lmacken at redhat.com> 3.6.4-1
- Update to v3.6.4, which works with the PyParted 2.0 API
diff --git a/setup.py b/setup.py
index 0b0a07d..52b265e 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ if sys.platform == 'win32':
setup(
name = 'liveusb-creator',
- version = '3.6.4',
+ version = '3.6.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.6.4',
+ version = '3.6.5',
packages = ['liveusb'],
scripts = ['liveusb-creator'],
license = 'GNU General Public License (GPL)',
commit 814c4e14773ab36abaa70ff151b73cb229f18b01
Author: Luke Macken <lmacken at redhat.com>
Date: Thu Apr 9 09:59:18 2009 -0400
Add F11 beta, and the latest Sugar on a Stick to our releases list
diff --git a/liveusb/releases.py b/liveusb/releases.py
index 83ffd2b..3f07fa3 100644
--- a/liveusb/releases.py
+++ b/liveusb/releases.py
@@ -1,4 +1,26 @@
releases = (
+ ## F11 Beta
+ {
+ 'name': 'Fedora 11 Beta (i686)',
+ 'url': 'http://download.fedoraproject.org/pub/fedora/linux//releases/test/11-Beta/Live/i686/F11-Beta-i686-Live.iso',
+ 'sha1': '46b3251533402acb0b20b4d0df323e6783c32ec717921133b6c557e5cd091d0a',
+ },
+ {
+ 'name': 'Fedora 11 Beta KDE (i686)',
+ 'url': 'http://download.fedoraproject.org/pub/fedora/linux//releases/test/11-Beta/Live/i686/F11-Beta-i686-Live-KDE.iso',
+ 'sha1': '149257a5283053dcde2b0525d46ba18fe9fe07484c6c5c8c58949877dafd201d',
+ },
+ {
+ 'name': 'Fedora 11 Beta (x86_64)',
+ 'url': 'http://download.fedoraproject.org/pub/fedora/linux//releases/test/11-Beta/Live/x86_64/F11-Beta-x86_64-Live.iso',
+ 'sha1': 'fdc068688f302decef00bdfc95f474a9612fddf505eec0840f0345f112ddd055',
+ },
+ {
+ 'name': 'Fedora 11 Beta KDE (x86_64)',
+ 'url': 'http://download.fedoraproject.org/pub/fedora/linux//releases/test/11-Beta/Live/x86_64/F11-Beta-x86_64-Live-KDE.iso',
+ 'sha1': '4ca6dd4be116789d3c3b50b742cc9f8c07c0adc5e314fd4c144e0d08ecff0b44',
+ },
+
{
'name': 'Fedora 10 (i686)',
'url': 'http://download.fedoraproject.org/pub/fedora/linux/releases/10/Live/i686/F10-i686-Live.iso',
@@ -20,28 +42,6 @@ releases = (
'sha1': 'a58634cf8dbd9e27db2b9cbf48d18c2e0dfe941e',
},
- ## F11 Alpha
- {
- 'name': 'Fedora 11 Alpha (i686)',
- 'url': 'http://download.fedoraproject.org/pub/fedora/linux/releases/test/11-Alpha/Live/i686/F11-Alpha-i686-Live.iso',
- 'sha1': '6eb44cd56b041ed683a898cf690b468177f3e3f5',
- },
- {
- 'name': 'Fedora 11 Alpha KDE (i686)',
- 'url': 'http://download.fedoraproject.org/pub/fedora/linux/releases/test/11-Alpha/Live/i686/F11-Alpha-i686-Live-KDE.iso',
- 'sha1': '64851662f7b11e230c875e066519e49211ac8ad0',
- },
- {
- 'name': 'Fedora 11 Alpha (x86_64)',
- 'url': 'http://download.fedoraproject.org/pub/fedora/linux/releases/test/11-Alpha/Live/x86_64/F11-Alpha-x86_64-Live.iso',
- 'sha1': 'd499f6c85b6e76967b7161c634539d9077b30cb8',
- },
- {
- 'name': 'Fedora 11 Alpha KDE (x86_64)',
- 'url': 'http://download.fedoraproject.org/pub/fedora/linux/releases/test/11-Alpha/Live/x86_64/F11-Alpha-x86_64-Live-KDE.iso',
- 'sha1': 'fefb6d261cfb547c7b8a99db9452ac7469cac778',
- },
-
{
'name': 'Fedora 9 (i686)',
'url': 'http://download.fedoraproject.org/pub/fedora/linux/releases/9/Live/i686/Fedora-9-i686-Live.iso',
@@ -87,8 +87,8 @@ releases = (
## Custom spins
##
{
- 'name': 'Sugar Spin 0.82-2 (i686)',
- 'url': 'http://alt.fedoraproject.org/pub/alt/olpc/0.82-2/i686/sugar-spin.iso',
- 'sha1': '5f51daf59a303036858905c18a95c8270f19559d',
+ 'name': 'Sugar on a Stick (beta)',
+ 'url': 'http://download.sugarlabs.org/soas/releases/soas-beta.iso',
+ #'sha1': '',
},
)
commit f0a47162b6125fe457f1b53495b6048349411c93
Author: Luke Macken <lmacken at redhat.com>
Date: Thu Apr 9 09:58:57 2009 -0400
If no 'sha1' is specified in our releases list, don't try and verify it
diff --git a/liveusb/gui.py b/liveusb/gui.py
index 293d87c..b55e405 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -183,7 +183,7 @@ class LiveUSBThread(QtCore.QThread):
# If we know about this ISO, and it's SHA1 -- verify it
release = self.live.get_release_from_iso()
- if release and release['sha1']:
+ if release and 'sha1' in release and release['sha1']:
if not self.live.verify_iso_sha1(progress=self):
return
More information about the liveusb-creator
mailing list