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.
This commit is contained in:
Goffi 2019-10-08 12:10:26 +02:00
commit f7aad247c2

View file

@ -26,7 +26,6 @@ log = getLogger(__name__)
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 @@ class PasswordSessions(ProfileSessions):
)
# 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 @@ class Memory(object):
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)