Merge lp:~lutostag/charms/trusty/logstash/trunk+local-download-fix into lp:~lazypower/charms/trusty/logstash/trunk

[Greg Lutostanski]

Just two minor fixes:
One to get downloaded files to work appropriately.
And do not try to install '' extra packages.

[Charles Butler (lazypower)]

Greg, apologies on missing this merge - I've refactored the charm quite a bit and this no longer cleanly applies. I'll dig into this later and get it merged in.

Thanks for the fix!

[Charles Butler (lazypower)]

This was fixed in my latest upstream copy. Thanks for the contribution - i used it as a reference.

Unmerged revisions

19. By Greg Lutostanski on 2014-08-07

fix using downloaded logstash.tar.gz in charm/files and install of no extra packages by default

=== modified file 'hooks/install'
--- hooks/install	2014-07-24 13:26:45 +0000
+++ hooks/install	2014-08-07 19:33:20 +0000
@@ -8,6 +8,7 @@
 import subprocess
 import sys
 import tarfile
+import tempfile
 
 sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
 
@@ -36,7 +37,7 @@
     extra_packages = config('extra-packages')
     apt_update(fatal=True)
     apt_install(packages, fatal=True)
-    if extra_packages is not None:
+    if extra_packages:
         apt_install(extra_packages, fatal=True)
 
     # Place default redis template
@@ -82,15 +83,19 @@
                 sha.hexdigest()))
 
     # Extract and move into place
-    extract_package(filename)
+    extract_package(fpath)
 
 
 def extract_package(filename):
-    t = tarfile.open(os.path.join(os.path.sep, 'tmp', filename))
-    t.extractall(path='.')
+    tempdir = tempfile.mkdtemp()
+    t = tarfile.open(filename)
+    t.extractall(path=tempdir)
     t.close()
-    basename = filename.rsplit('.', 2)[0]
-    shutil.move(basename, BASEPATH)
+    dirnames = os.listdir(tempdir)
+    if not len(dirnames) == 1:
+        raise ValueError('Did not extract archive correctly to %s' % tempdir)
+    shutil.move(os.path.join(tempdir, dirnames[0]), BASEPATH)
+    shutil.rmtree(tempdir)
 
 
 def create_skeleton():