diff options
author | Runar Borge <runar@borge.nu> | 2018-06-09 22:31:09 +0200 |
---|---|---|
committer | Runar Borge <runar@borge.nu> | 2018-06-09 22:31:09 +0200 |
commit | f3b4cfecbe48c75c88b9396f68c4b9fc2d7babc1 (patch) | |
tree | a043804da4a0b841c86455ceb8c9e8d5f73f7717 /python/vyos/version.py | |
parent | 06b807f9b898c6bef55c9c0888bf5fd1c96bc9bd (diff) | |
parent | e916c9a55ffdff970c1796829d1bee319802b353 (diff) | |
download | vyos-1x-f3b4cfecbe48c75c88b9396f68c4b9fc2d7babc1.tar.gz vyos-1x-f3b4cfecbe48c75c88b9396f68c4b9fc2d7babc1.zip |
Merge branch 'current' of git://github.com/vyos/vyos-1x into current
Diffstat (limited to 'python/vyos/version.py')
-rw-r--r-- | python/vyos/version.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/python/vyos/version.py b/python/vyos/version.py index 5d32d878d..545d4e76b 100644 --- a/python/vyos/version.py +++ b/python/vyos/version.py @@ -17,9 +17,14 @@ # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR # IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +import os import json -def get_version_data(file='/opt/vyatta/etc/version.json'): +import vyos.defaults + +version_file = os.path.join(vyos.defaults.directories['data'], 'version.json') + +def get_version_data(file=version_file): with open(file, 'r') as f: version_data = json.load(f) return version_data |