Skip to content
Snippets Groups Projects
Commit 48071453 authored by inso's avatar inso
Browse files

Version 0.11.2

parent 3562bb33
No related branches found
No related tags found
No related merge requests found
#!/usr/bin/python
# -*- coding: utf-8 -*-
# source d'inspiration: http://wiki.wxpython.org/cx_freeze
import sys, os, subprocess, multiprocessing, site import sys, os, subprocess, multiprocessing, site
from cx_Freeze import setup, Executable from cx_Freeze import setup, Executable
from PyQt5 import QtCore from PyQt5 import QtCore
...@@ -116,7 +111,7 @@ target = Executable( ...@@ -116,7 +111,7 @@ target = Executable(
# creation du setup # creation du setup
setup( setup(
name = "sakia", name = "sakia",
version = "0.11.1", version = "0.11.2",
description = "UCoin client", description = "UCoin client",
author = "Inso", author = "Inso",
options = {"build_exe": options}, options = {"build_exe": options},
......
__version_info__ = ('0', '11', '1') __version_info__ = ('0', '11', '2')
__version__ = '.'.join(__version_info__) __version__ = '.'.join(__version_info__)
...@@ -278,19 +278,13 @@ class Application(QObject): ...@@ -278,19 +278,13 @@ class Application(QObject):
if os.path.exists(network_path): if os.path.exists(network_path):
with open(network_path, 'r') as json_data: with open(network_path, 'r') as json_data:
data = json.load(json_data) data = json.load(json_data)
if 'version' in data and data['version'] == __version__:
logging.debug("Merging network : {0}".format(data)) logging.debug("Merging network : {0}".format(data))
community.network.merge_with_json(data['network']) community.network.merge_with_json(data['network'])
else:
os.remove(network_path)
if os.path.exists(bma_path): if os.path.exists(bma_path):
with open(bma_path, 'r') as json_data: with open(bma_path, 'r') as json_data:
data = json.load(json_data) data = json.load(json_data)
if 'version' in data and data['version'] == __version__:
community.bma_access.load_from_json(data['cache']) community.bma_access.load_from_json(data['cache'])
else:
os.remove(bma_path)
for wallet in account.wallets: for wallet in account.wallets:
for c in account.communities: for c in account.communities:
...@@ -300,10 +294,7 @@ class Application(QObject): ...@@ -300,10 +294,7 @@ class Application(QObject):
if os.path.exists(wallet_path): if os.path.exists(wallet_path):
with open(wallet_path, 'r') as json_data: with open(wallet_path, 'r') as json_data:
data = json.load(json_data) data = json.load(json_data)
if 'version' in data and data['version'] == __version__:
wallet.load_caches(self, data) wallet.load_caches(self, data)
else:
os.remove(wallet_path)
def load_preferences(self): def load_preferences(self):
""" """
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment