Imported Upstream version 0.8.2upstream/0.8.2upstream

7 files changed, 22 insertions, 12 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 903d37c..f778a43 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,8 +7,8 @@ include README
 include setup.py
 include setup.cfg
 include integration-tests
-recursive-include integration-tests.d
-recursive-include lava/
-recursive-include lava_dashboard_tool/
-recursive-include lava_scheduler_tool/
-recursive-include lava_tool/
+recursive-include integration-tests.d/ *
+recursive-include lava/ *.py
+recursive-include lava_dashboard_tool/ *.py
+recursive-include lava_scheduler_tool/ *.py
+recursive-include lava_tool/ *.py
diff --git a/PKG-INFO b/PKG-INFO
index 0c6e058..0c4cbb9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: lava-tool
-Version: 0.8.1
+Version: 0.8.2
 Summary: Command line utility for Linaro validation services
 Home-page: https://launchpad.net/lava-tool
 Author: Zygmunt Krynicki
diff --git a/lava/config.py b/lava/config.py
index 1fb517f..7196fcb 100644
--- a/lava/config.py
+++ b/lava/config.py
@@ -290,5 +290,15 @@ class InteractiveCache(InteractiveConfig):
 
         :return The path to the XDG resource.
         """
-        return xdgBaseDir.save_cache_path(DEFAULT_XDG_RESOURCE,
-                                          DEFAULT_LAVA_TOOL_RESOURCE)
+        cache_dir = None
+        try:
+            cache_dir = xdgBaseDir.save_cache_path(DEFAULT_XDG_RESOURCE,
+                                                   DEFAULT_LAVA_TOOL_RESOURCE)
+        except AttributeError:
+            # python-xdg 0.19 (Ubuntu Precise)
+            # FIXME this duplicates the semantics from the newer python-xdg
+            cache_dir = os.path.join(xdgBaseDir.xdg_cache_home, DEFAULT_XDG_RESOURCE, DEFAULT_LAVA_TOOL_RESOURCE)
+            if not os.path.exists(cache_dir):
+                os.makedirs(cache_dir)
+
+        return cache_dir
diff --git a/lava/tool/__init__.py b/lava/tool/__init__.py
index 84f311d..736d6f7 100644
--- a/lava/tool/__init__.py
+++ b/lava/tool/__init__.py
@@ -24,4 +24,4 @@ lava.tool
 Generic code for command line utilities for LAVA
 """
 
-__version__ = (0, 8, 1, "final", 0)
+__version__ = (0, 8, 2, "final", 0)
diff --git a/lava_tool.egg-info/PKG-INFO b/lava_tool.egg-info/PKG-INFO
index 0c6e058..0c4cbb9 100644
--- a/lava_tool.egg-info/PKG-INFO
+++ b/lava_tool.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: lava-tool
-Version: 0.8.1
+Version: 0.8.2
 Summary: Command line utility for Linaro validation services
 Home-page: https://launchpad.net/lava-tool
 Author: Zygmunt Krynicki
diff --git a/lava_tool.egg-info/requires.txt b/lava_tool.egg-info/requires.txt
index 721c7ce..78d7500 100644
--- a/lava_tool.egg-info/requires.txt
+++ b/lava_tool.egg-info/requires.txt
@@ -4,4 +4,4 @@ argcomplete >= 0.3
 keyring
 json-schema-validator >= 2.0
 versiontools >= 1.3.1
-pyxdg == 0.25
\ No newline at end of file
+pyxdg >= 0.19
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 7855268..2d0459a 100755
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ setup(
         'keyring',
         'json-schema-validator >= 2.0',
         'versiontools >= 1.3.1',
-        'pyxdg == 0.25',
+        'pyxdg >= 0.19',
     ],
     setup_requires=['versiontools >= 1.3.1'],
     tests_require=[