Makefile | 2 +- imgcreate/fs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 741d3cddac6f821301b48aed89093d8fe6d7c8ca Author: Brian C. Lane <[email protected]> Date: Thu Oct 25 10:05:33 2012 -0700 Version 13.4.3 diff --git a/Makefile b/Makefile index f003c4d..2abfac3 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 13.4.2 +VERSION = 13.4.3 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} commit 8963f41eb0576f825274e69f3351e15ba7582c52 Author: Brian C. Lane <[email protected]> Date: Tue Oct 23 11:37:56 2012 -0700 don't pass None to mksquashfs (#869300) If the compression type is None don't pass --comp to mksquashfs. Resolves: rhbz#869300 diff --git a/imgcreate/fs.py b/imgcreate/fs.py index d7b751b..67d4c3d 100644 --- a/imgcreate/fs.py +++ b/imgcreate/fs.py @@ -42,7 +42,7 @@ def makedirs(dirname): def mksquashfs(in_img, out_img, compress_type): # Allow gzip to work for older versions of mksquashfs - if compress_type == "gzip": + if not compress_type or compress_type == "gzip": args = ["/sbin/mksquashfs", in_img, out_img] else: args = ["/sbin/mksquashfs", in_img, out_img, "-comp", compress_type] -- livecd mailing list [email protected] https://admin.fedoraproject.org/mailman/listinfo/livecd
