threads / patch / 21292

patchimport-tars: Add support for tarballs compressed with lzma, xz

Subject: [PATCH] import-tars: Add support for tarballs compressed with lzma, xz

## tl;dr

3 messages between Oct 20, 2009 and Oct 20, 2009. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Ingmar Vanhassel· Oct 20, 2009, 08:59 UTC · lore
Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
---
 contrib/fast-import/import-tars.perl |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
Show changes to contrib/fast-import/import-tars.perl +4 −1
diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index 7001862..95438e1 100755
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -20,7 +20,7 @@ use Getopt::Long;
 
 my $metaext = '';
 
-die "usage: import-tars [--metainfo=extension] *.tar.{gz,bz2,Z}\n"
+die "usage: import-tars [--metainfo=extension] *.tar.{gz,bz2,lzma,xz,Z}\n"
 	unless GetOptions('metainfo=s' => \$metaext) && @ARGV;
 
 my $branch_name = 'import-tars';
@@ -49,6 +49,9 @@ foreach my $tar_file (@ARGV)
 	} elsif ($tar_name =~ s/\.tar\.Z$//) {
 		open(I, '-|', 'uncompress', '-c', $tar_file)
 			or die "Unable to uncompress -c $tar_file: $!\n";
+	} elsif ($tar_name =~ s/\.(tar\.(lzma|xz)|(tlz|txz))$//) {
+		open(I, '-|', 'xz', '-dc', $tar_file)
+			or die "Unable to xz -dc $tar_file: $!\n";
 	} elsif ($tar_name =~ s/\.tar$//) {
 		open(I, $tar_file) or die "Unable to open $tar_file: $!\n";
 	} else {
-- 
1.6.5.1
Johannes Schindelin· Oct 20, 2009, 09:56 UTC · re: Ingmar Vanhassel · lore

Re: [PATCH] import-tars: Add support for tarballs compressed with lzma, xz

Hi,
On Tue, 20 Oct 2009, Ingmar Vanhassel wrote:
> Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>

Nice! Maybe you want to mention in the commit message that it handles also .txz and .tlz, for convenience. (I was looking specifically for that support in the patch, fully prepared to suggest to add it...)

Ciao, Dscho

Ingmar Vanhassel· Oct 20, 2009, 10:29 UTC · re: Johannes Schindelin · lore

Also handle the extensions .tlz and .txz, aliases for .tar.lzma and .tar.xz respectively.

Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
---
 contrib/fast-import/import-tars.perl |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
> Nice!  Maybe you want to mention in the commit message that it handles
> also .txz and .tlz, for convenience.  (I was looking specifically for that
> support in the patch, fully prepared to suggest to add it...)
Right, thanks!
Show changes to contrib/fast-import/import-tars.perl +4 −1
diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index 7001862..95438e1 100755
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -20,7 +20,7 @@ use Getopt::Long;
 
 my $metaext = '';
 
-die "usage: import-tars [--metainfo=extension] *.tar.{gz,bz2,Z}\n"
+die "usage: import-tars [--metainfo=extension] *.tar.{gz,bz2,lzma,xz,Z}\n"
 	unless GetOptions('metainfo=s' => \$metaext) && @ARGV;
 
 my $branch_name = 'import-tars';
@@ -49,6 +49,9 @@ foreach my $tar_file (@ARGV)
 	} elsif ($tar_name =~ s/\.tar\.Z$//) {
 		open(I, '-|', 'uncompress', '-c', $tar_file)
 			or die "Unable to uncompress -c $tar_file: $!\n";
+	} elsif ($tar_name =~ s/\.(tar\.(lzma|xz)|(tlz|txz))$//) {
+		open(I, '-|', 'xz', '-dc', $tar_file)
+			or die "Unable to xz -dc $tar_file: $!\n";
 	} elsif ($tar_name =~ s/\.tar$//) {
 		open(I, $tar_file) or die "Unable to open $tar_file: $!\n";
 	} else {
-- 
1.6.5.1

← back to recent threads