From b9234c8e12ac08cadf8860aaa4ea38f0ee60576d Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Sat, 17 Jan 2009 18:27:28 +0000
Subject: [PATCH] Get the LZMA archive decompressor through Zero Install if
 missing

---
 setup.py                        |   1 +
 tests/HelloWorld.tar.lzma       | Bin 0 -> 182 bytes
 tests/testunpack.py             |   5 +++++
 zeroinstall/zerostore/_unlzma   |   2 ++
 zeroinstall/zerostore/unpack.py |   9 +++++----
 5 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 tests/HelloWorld.tar.lzma
 create mode 100755 zeroinstall/zerostore/_unlzma

diff --git a/setup.py b/setup.py
index 642e6a1..08afb80 100644
--- a/setup.py
+++ b/setup.py
@@ -16,6 +16,7 @@ class build_with_data(build_py):
 		"zeroinstall/0launch-gui/zero-install.glade",
 		"zeroinstall/gtkui/desktop.glade",
 		"zeroinstall/gtkui/cache.glade",
+		"zeroinstall/zerostore/_unlzma",
 	]
 	def run(self):
 		# Copy .py files and build, as usual
diff --git a/tests/HelloWorld.tar.lzma b/tests/HelloWorld.tar.lzma
new file mode 100644
index 0000000000000000000000000000000000000000..14bbe77b19f24f8a3a8f4947be197fc7c21dc95d
GIT binary patch
literal 182
zcwPav07?H{004jh|NsC0|NsC003;bnm~SiYZzHVyum-rv5fSEHKZE^9DlilWf_L35
zaa)?gObWl#g9{hs0TD_Ks6a8xzY>1^RX~Y1P*l_0V6jcrR;){#Y_!d1S`E|G&@sg)
zL{tLXej%aA0NuKzQXMG;YIdUn2m&7u$?e^dLkN0k0vySMJ@*K~Lo5;eYDUEFHh(OR
kE>DENz`WYj9HAL<osdAP0DMu@RRQ)1<;rD_AO1kg@*&PtC;$Ke

literal 0
HcwPel00001

diff --git a/tests/testunpack.py b/tests/testunpack.py
index 91cb24c..f9286a1 100755
--- a/tests/testunpack.py
+++ b/tests/testunpack.py
@@ -117,6 +117,11 @@ class TestUnpackGNU(AbstractTestUnpack):
 		unpack._tar_version = None
 		assert unpack._gnu_tar()
 
+	# Only available with GNU tar
+	def testLzma(self):
+		unpack.unpack_archive('ftp://foo/file.tar.lzma', file('HelloWorld.tar.lzma'), self.tmpdir)
+		self.assert_manifest('sha1new=290eb133e146635fe37713fd58174324a16d595f')
+
 suite = unittest.TestSuite()
 if unpack._gnu_tar():
 	suite.addTest(unittest.makeSuite(TestUnpackGNU))
diff --git a/zeroinstall/zerostore/_unlzma b/zeroinstall/zerostore/_unlzma
new file mode 100755
index 0000000..4f823ea
--- /dev/null
+++ b/zeroinstall/zerostore/_unlzma
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec 0launch --message="An LZMA decompressor is needed to extract this archive" http://0install.net/2008/interfaces/lzmadec.xml "$@"
diff --git a/zeroinstall/zerostore/unpack.py b/zeroinstall/zerostore/unpack.py
index ec005e9..cf6c0cd 100644
--- a/zeroinstall/zerostore/unpack.py
+++ b/zeroinstall/zerostore/unpack.py
@@ -101,9 +101,7 @@ def check_type_ok(mime_type):
 			raise SafeException("This package looks like a Microsoft Cabinet archive, but you don't have the 'cabextract' command "
 					"I need to extract it. Install the package containing it first.")
 	elif mime_type == 'application/x-lzma-compressed-tar':
-		if not find_in_path('unlzma'):
-			raise SafeException("This package looks like an LZMA archive, but you don't have the 'unlzma' command "
-					"I need to extract it. Install the package containing it (it's probably called 'lzma') first.")
+		pass	# We can get it through Zero Install
 	elif mime_type in ('application/x-compressed-tar', 'application/x-tar'):
 		pass
 	else:
@@ -313,7 +311,10 @@ def extract_tar(stream, destdir, extract, decompress, start_offset = 0):
 			elif decompress == 'gzip':
 				ext_cmd.append('-z')
 			elif decompress == 'lzma':
-				ext_cmd.append('--use-compress-program=unlzma')
+				unlzma = find_in_path('unlzma')
+				if not unlzma:
+					unlzma = os.path.abspath(os.path.join(os.path.dirname(__file__), '_unlzma'))
+				ext_cmd.append('--use-compress-program=' + unlzma)
 
 		if recent_gnu_tar():
 			ext_cmd.extend(('-x', '--no-same-owner', '--no-same-permissions'))
-- 
2.11.4.GIT