imgcreate/fs.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 36b6165c0ec2f05ecd6c625f6669c19caf1d38ae
Author: Brian C. Lane <bcl(a)redhat.com>
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 d4558d3..38ac724 100644
--- a/imgcreate/fs.py
+++ b/imgcreate/fs.py
@@ -72,7 +72,7 @@ def squashfs_compression_type(sqfs_img):
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]
Show replies by thread