diff options
| author | Antonio Terceiro <antonio.terceiro@linaro.org> | 2013-11-25 18:23:34 -0300 |
|---|---|---|
| committer | Antonio Terceiro <antonio.terceiro@linaro.org> | 2013-11-25 18:23:34 -0300 |
| commit | d3b65104110aa14d9017c9d1484ff48e2df77d8d (patch) | |
| tree | 578c7ed1968226194a76e4be97a7e26d076b69ea | |
| parent | 5d71a95ed915a9884b5fc1ddd21e24c85fa99556 (diff) | |
| parent | ac436180e312797819b6578551dcfbbb4ac7935b (diff) | |
Merge tag 'upstream/0.8.2'
Upstream version 0.8.2
# gpg: Signature made Seg 25 Nov 2013 18:23:31 BRT using RSA key ID CD460BDE
# gpg: Good signature from "Antonio Terceiro <terceiro@softwarelivre.org>"
# gpg: aka "Antonio Terceiro <terceiro@dcc.ufba.br>"
# gpg: aka "Antonio Terceiro <terceiro@colivre.coop.br>"
# gpg: aka "Antonio Terceiro <terceiro@debian.org>"
# gpg: aka "Antonio Terceiro <terceiro@cs.ubc.ca>"
# gpg: aka "Antonio Terceiro <antonio.terceiro@linaro.org>"
| -rw-r--r-- | MANIFEST.in | 10 | ||||
| -rw-r--r-- | PKG-INFO | 2 | ||||
| -rw-r--r-- | lava/config.py | 14 | ||||
| -rw-r--r-- | lava/tool/__init__.py | 2 | ||||
| -rw-r--r-- | lava_tool.egg-info/PKG-INFO | 2 | ||||
| -rw-r--r-- | lava_tool.egg-info/requires.txt | 2 | ||||
| -rwxr-xr-x | setup.py | 2 |
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 @@ -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 @@ -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=[ |