4 commits - liveusb/creator.py liveusb-creator.spec setup.py

Luke Macken lmacken at fedoraproject.org
Sun Nov 8 00:41:33 UTC 2009


 liveusb-creator.spec |    5 ++++-
 liveusb/creator.py   |   14 ++++++--------
 setup.py             |    4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit 3d6e7139567052ab75fd8ca8e4ed921327d8a333
Merge: 71b18e3... 97f9ed8...
Author: Luke Macken <lmacken at redhat.com>
Date:   Sat Nov 7 19:15:42 2009 -0500

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



commit 71b18e336159ee57596dadbef9f87b3afdb0f89a
Author: Luke Macken <lmacken at redhat.com>
Date:   Sat Nov 7 15:07:17 2009 -0500

    3.8.6

diff --git a/liveusb-creator.spec b/liveusb-creator.spec
index 4f926e3..7268207 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.7.3
+Version:        3.8.6
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Sat Nov 07 2009 Luke Macken <lmacken at redhat.com> - 3.8.6-1
+- 3.8.6
+
 * Thu Aug 27 2009 Luke Macken <lmacken at redhat.com> - 3.7.3-1
 - 3.7.3
 
diff --git a/setup.py b/setup.py
index efecf34..c291a69 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ if sys.platform == 'win32':
 
     setup(
         name = 'liveusb-creator',
-        version = '3.8.5',
+        version = '3.8.6',
         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.8.5',
+        version = '3.8.6',
         packages = ['liveusb'],
         scripts = ['liveusb-creator'],
         license = 'GNU General Public License (GPL)',


commit a3abe441e9ba46c8769ee73731afb3d7ea11aa58
Author: Luke Macken <lmacken at redhat.com>
Date:   Fri Nov 6 23:30:48 2009 -0500

    Trivial os.path usage tweak

diff --git a/liveusb/creator.py b/liveusb/creator.py
index de9ed75..a93afcb 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -1065,12 +1065,11 @@ class WindowsLiveUSBCreator(LiveUSBCreator):
         """ Calculate the hash of the extracted LiveOS """
         chunk_size = 1024 # FIXME: optimize this.  we hit bugs when this is *not* 1024
         checksums = []
-        from os.path import join
-        for img in (join('LiveOS', 'osmin.img'),
-                    join('LiveOS', 'squashfs.img'),
-                    join('syslinux', 'initrd0.img'),
-                    join('syslinux', 'vmlinuz0'),
-                    join('syslinux', 'isolinux.bin')):
+        for img in (os.path.join('LiveOS', 'osmin.img'),
+                    os.path.join('LiveOS', 'squashfs.img'),
+                    os.path.join('syslinux', 'initrd0.img'),
+                    os.path.join('syslinux', 'vmlinuz0'),
+                    os.path.join('syslinux', 'isolinux.bin')):
             hash = getattr(hashlib, self.opts.hash, 'sha1')()
             liveos = os.path.join(self.drive['device'], img)
             device = file(liveos, 'rb')
@@ -1088,4 +1087,3 @@ class WindowsLiveUSBCreator(LiveUSBCreator):
         hash = getattr(hashlib, self.opts.hash, 'sha1')()
         map(hash.update, checksums)
         self.log.info("%s = %s" % (hash.name, hash.hexdigest()))
-


commit dee3c8e34f31597773a13a0fb8c1c9dbe48809bf
Author: Luke Macken <lmacken at redhat.com>
Date:   Fri Nov 6 20:07:50 2009 -0500

    Quote our syslinux path when running extlinux (#490843)

diff --git a/liveusb/creator.py b/liveusb/creator.py
index 85bf01b..de9ed75 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -623,7 +623,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
         if self.drive['fstype'] in ('ext2', 'ext3'):
             shutil.move(os.path.join(syslinux_path, "syslinux.cfg"),
                         os.path.join(syslinux_path, "extlinux.conf"))
-            self.popen('extlinux -i %s' % syslinux_path)
+            self.popen("extlinux -i '%s'" % syslinux_path)
         else: # FAT
             self.popen('syslinux%s%s -d %s %s' %  (self.opts.force and
                        ' -f' or '', self.opts.safe and ' -s' or '',




More information about the liveusb-creator mailing list