|
 |
3b4060b |
diff -up patool-upstream-1.12/patoolib/programs/star.py.fix_star_options patool-upstream-1.12/patoolib/programs/star.py
|
|
 |
3b4060b |
--- patool-upstream-1.12/patoolib/programs/star.py.fix_star_options 2016-01-17 09:15:22.000000000 +0100
|
|
 |
3b4060b |
+++ patool-upstream-1.12/patoolib/programs/star.py 2018-02-07 16:09:03.901389029 +0100
|
|
 |
3b4060b |
@@ -14,7 +14,8 @@
|
|
 |
3b4060b |
# You should have received a copy of the GNU General Public License
|
|
 |
3b4060b |
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
 |
3b4060b |
"""Archive commands for the star program."""
|
|
 |
3b4060b |
-from .tar import add_tar_opts as add_star_opts
|
|
 |
3b4060b |
+import os
|
|
 |
3b4060b |
+
|
|
 |
3b4060b |
|
|
 |
3b4060b |
def extract_tar (archive, compression, cmd, verbosity, interactive, outdir):
|
|
 |
3b4060b |
"""Extract a TAR archive."""
|
|
 |
3b4060b |
@@ -39,3 +40,21 @@ def create_tar (archive, compression, cm
|
|
 |
3b4060b |
cmdlist.append("file=%s" % archive)
|
|
 |
3b4060b |
cmdlist.extend(filenames)
|
|
 |
3b4060b |
return cmdlist
|
|
 |
3b4060b |
+
|
|
 |
3b4060b |
+def add_star_opts (cmdlist, compression, verbosity):
|
|
 |
3b4060b |
+ """Add tar options to cmdlist."""
|
|
 |
3b4060b |
+ progname = os.path.basename(cmdlist[0])
|
|
 |
3b4060b |
+ if compression == 'gzip':
|
|
 |
3b4060b |
+ cmdlist.append('-z')
|
|
 |
3b4060b |
+ elif compression == 'compress':
|
|
 |
3b4060b |
+ cmdlist.append('-Z')
|
|
 |
3b4060b |
+ elif compression == 'bzip2':
|
|
 |
3b4060b |
+ cmdlist.append('-j')
|
|
 |
3b4060b |
+ elif compression in ('lzma', 'xz', 'lzip'):
|
|
 |
3b4060b |
+ # use the compression name as program name since
|
|
 |
3b4060b |
+ # tar is picky which programs it can use
|
|
 |
3b4060b |
+ program = compression
|
|
 |
3b4060b |
+ # set compression program
|
|
 |
3b4060b |
+ cmdlist.extend(['compress-program=', program])
|
|
 |
3b4060b |
+ if verbosity > 1:
|
|
 |
3b4060b |
+ cmdlist.append('-v')
|