Mercurial > libervia-backend

diff sat/memory/memory.py @ 3053:8b36e5c3f28f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
misc: don't import memory in launch script: launch script was importing a method from memory (fixLocalDir), but memory is importing twisted.internet.reactor which can result to a ReactorAlreadyInstalledError. This patch fixes it by moving fixLocalDir to tools/config. The launch script is now using /usr/bin/env.
author Goffi <goffi@goffi.org>
date Tue, 08 Oct 2019 12:10:26 +0200
parents fee60f17ebac
children 130f9cb6e0ab
line wrap: on
line diff
--- a/sat/memory/memory.py	Mon Oct 07 17:29:28 2019 +0200
+++ b/sat/memory/memory.py	Tue Oct 08 12:10:26 2019 +0200
@@ -26,7 +26,6 @@
 import os.path
 import copy
 from collections import namedtuple
-from configparser import ConfigParser, NoOptionError, NoSectionError
 from uuid import uuid4
 from twisted.python import failure
 from twisted.internet import defer, reactor, error
@@ -221,36 +220,6 @@
         )
 
 
-# XXX: tmp update code, will be removed in the future
-# When you remove this, please add the default value for
-# 'local_dir' in sat.core.constants.Const.DEFAULT_CONFIG
-def fixLocalDir(silent=True):
-    """Retro-compatibility with the previous local_dir default value.
-
-    @param silent (boolean): toggle logging output (must be True when called from sat.sh)
-    """
-    user_config = ConfigParser()
-    try:
-        user_config.read(C.CONFIG_FILES)
-    except:
-        pass  # file is readable but its structure if wrong
-    try:
-        current_value = user_config.get("DEFAULT", "local_dir")
-    except (NoOptionError, NoSectionError):
-        current_value = ""
-    if current_value:
-        return  # nothing to do
-    old_default = "~/.sat"
-    if os.path.isfile(os.path.expanduser(old_default) + "/" + C.SAVEFILE_DATABASE):
-        if not silent:
-            log.warning(
-                _(
-                    "A database has been found in the default local_dir for previous versions (< 0.5)"
-                )
-            )
-        tools_config.fixConfigOption("", "local_dir", old_default, silent)
-
-
 class Memory(object):
     """This class manage all the persistent information"""
 
@@ -266,7 +235,8 @@
         self.subscriptions = {}
         self.auth_sessions = PasswordSessions()  # remember the authenticated profiles
         self.disco = Discovery(host)
-        fixLocalDir(False)  # XXX: tmp update code, will be removed in the future
+        # XXX: tmp update code, will be removed in the future
+        tools_config.fixLocalDir(False)
         self.config = tools_config.parseMainConf()
         database_file = os.path.expanduser(
             os.path.join(self.getConfig("", "local_dir"), C.SAVEFILE_DATABASE)