2 commits - liveusb/creator.py liveusb/releases.py

Luke Macken lmacken at fedoraproject.org
Wed Nov 11 16:22:32 UTC 2009


 liveusb/creator.py  |    4 +++-
 liveusb/releases.py |    6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 7b3d063541d6006c77d6adc963b96efa958b5e95
Author: Luke Macken <lmacken at redhat.com>
Date:   Wed Nov 11 11:22:30 2009 -0500

    Add the stable SoaS back (#627)

diff --git a/liveusb/releases.py b/liveusb/releases.py
index 26ca7cb..27d5506 100644
--- a/liveusb/releases.py
+++ b/liveusb/releases.py
@@ -70,6 +70,12 @@ releases = (
     ## Custom spins
     ##
     {
+        'name': 'Sugar on a Stick (Strawberry)',
+        'url': 'http://download.sugarlabs.org/soas/releases/soas-1-strawberry.iso',
+        'sha1': '41b08c93a65cc1e38286b9f8980f51528a36761d',
+    },
+
+    {
         'name': 'Sugar on a Stick v2 beta (snapshot 04)',
         'url': 'http://download2.sugarlabs.org/soas/snapshots/2/soas04.iso',
         'sha1': '27700626ac05aa07aae4ee7fb411c6567945c3c8',


commit 612b7edfc008c15fed9091c495692c5b5ab958fa
Author: Luke Macken <lmacken at redhat.com>
Date:   Sun Nov 8 00:06:46 2009 -0500

    Fix a bug with the optional `parent` argument in the _add_device method (#622)

diff --git a/liveusb/creator.py b/liveusb/creator.py
index a93afcb..aad13ba 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -447,6 +447,8 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
     def _add_device(self, dev, parent=None):
         mount = str(dev.GetProperty('volume.mount_point'))
         device = str(dev.GetProperty('block.device'))
+        if parent:
+            parent = parent.GetProperty('block.device')
         self.drives[device] = {
             'label'   : str(dev.GetProperty('volume.label')).replace(' ', '_'),
             'fstype'  : str(dev.GetProperty('volume.fstype')),
@@ -457,7 +459,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
             'unmount' : False,
             'free'    : mount and self.get_free_bytes(mount) / 1024**2 or None,
             'device'  : device,
-            'parent'  : parent.GetProperty('block.device')
+            'parent'  : parent
         }
 
     def mount_device(self):




More information about the liveusb-creator mailing list