Merge lp:~canonical-ci-engineering/charms/trusty/logstash/local-tarball into lp:~lazypower/charms/trusty/logstash/trunk

[Celso Providelo]

Fixing local tarball/payload installation logic.

Fixing local tarball/payload installation logic.

[Charles Butler (lazypower)]

+1 LGTM

review: Approve

=== modified file 'hooks/install'
--- hooks/install	2014-09-23 20:20:33 +0000
+++ hooks/install	2015-03-30 19:49:09 +0000
@@ -83,14 +83,14 @@
                 sha.hexdigest()))
 
     # Extract and move into place
-    extract_package(filename)
-
-
-def extract_package(filename):
-    t = tarfile.open(os.path.join(os.path.sep, 'tmp', filename))
+    extract_package(fpath)
+
+
+def extract_package(filepath):
+    t = tarfile.open(filepath)
     t.extractall(path='.')
     t.close()
-    basename = filename.rsplit('.', 2)[0]
+    [basename] = [v for v in os.listdir('.') if v.startswith('logstash-')]
     shutil.move(basename, BASEPATH)