From 7df5a0e616b3cf61c843fa345a9e89fa07e0e360 Mon Sep 17 00:00:00 2001 From: Gui Chen Date: Mon, 16 Sep 2013 02:29:13 -0400 Subject: [PATCH] prefer to use 'pbzip2'/'pgzip' than 'bzip2'/'gzip' Fixes: #1281 Change-Id: I72c996fde9689c7c684848dade4add8b76b00b07 Signed-off-by: Gui Chen --- mic/utils/misc.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/mic/utils/misc.py b/mic/utils/misc.py index 6810248..d9260f3 100644 --- a/mic/utils/misc.py +++ b/mic/utils/misc.py @@ -182,13 +182,21 @@ def extract_rpm(rpmfile, targetdir): def compressing(fpath, method): comp_map = { - "gz": "gzip", - "bz2": "bzip2" + "gz": ["pgzip", "pigz", "gzip"], + "bz2": ["pbzip2", "bzip2"], } if method not in comp_map: raise CreatorError("Unsupport compress format: %s, valid values: %s" % (method, ','.join(comp_map.keys()))) - cmd = find_binary_path(comp_map[method]) + cmd = None + for cmdname in comp_map[method]: + try: + cmd = find_binary_path(cmdname) + break + except CreatorError as err: + pass + if not cmd: + raise CreatorError("Command %s not available" % cmdname) rc = runner.show([cmd, "-f", fpath]) if rc: raise CreatorError("Failed to %s file: %s" % (comp_map[method], fpath)) -- 2.7.4