*** tar.py_orig 2014-05-20 21:01:41.446446705 +0200 --- tar.py 2014-05-20 21:03:52.842447209 +0200 *************** *** 56,62 **** GZIP_COMPRESSION_SPEED = "-1" ! _FOP = fam.get_file_operations_facade_instance() --- 56,71 ---- GZIP_COMPRESSION_SPEED = "-1" ! if os.path.exists("/usr/bin/pigz"): ! # use parallel gzip: pigz in stead of default ! TAR_GZIP_OPTION = "--use-compress-program=pigz" ! else: ! TAR_GZIP_OPTION = "--gzip" ! if os.path.exists("/usr/bin/pbzip2"): ! # use parallel gzip: pigz in stead of default ! TAR_BZIP_OPTION = "--use-compress-program=pbzip2" ! else: ! TAR_BZIP_OPTION = "--bzip2" _FOP = fam.get_file_operations_facade_instance() *************** *** 101,109 **** if archType == "tar" : pass elif archType == "gzip" : ! options.insert(1, "--gzip") elif archType == "bzip2" : ! options.insert(1, "--bzip2") else : raise SBException (_("Invalid archive type.")) --- 110,118 ---- if archType == "tar" : pass elif archType == "gzip" : ! options.insert(1, TAR_GZIP_OPTION) elif archType == "bzip2" : ! options.insert(1, TAR_BZIP_OPTION) else : raise SBException (_("Invalid archive type.")) *************** *** 159,167 **** if archType == "tar" : pass elif archType == "gzip" : ! options.insert(1, "--gzip") elif archType == "bzip2" : ! options.insert(1, "--bzip2") else : raise SBException (_("Invalid archive type.")) --- 168,176 ---- if archType == "tar" : pass elif archType == "gzip" : ! options.insert(1, TAR_GZIP_OPTION) elif archType == "bzip2" : ! options.insert(1, TAR_BZIP_OPTION) else : raise SBException (_("Invalid archive type.")) *************** *** 205,213 **** if archType == "tar" : pass elif archType == "gzip" : ! options.insert(1, "--gzip") elif archType == "bzip2" : ! options.insert(1, "--bzip2") else : raise SBException (_("Invalid archive type.")) --- 214,222 ---- if archType == "tar" : pass elif archType == "gzip" : ! options.insert(1, TAR_GZIP_OPTION) elif archType == "bzip2" : ! options.insert(1, TAR_BZIP_OPTION) else : raise SBException (_("Invalid archive type.")) *************** *** 274,283 **** archivename = "files.tar" if snapshot.getFormat() == "gzip": ! options.insert(0, "--gzip") archivename += ".gz" elif snapshot.getFormat() == "bzip2": ! options.insert(0, "--bzip2") archivename += ".bz2" elif snapshot.getFormat() == "none": pass --- 283,292 ---- archivename = "files.tar" if snapshot.getFormat() == "gzip": ! options.insert(0, TAR_GZIP_OPTION) archivename += ".gz" elif snapshot.getFormat() == "bzip2": ! options.insert(0, TAR_BZIP_OPTION) archivename += ".bz2" elif snapshot.getFormat() == "none": pass