Compare commits
2 Commits
ee2db0c2e3
...
c60cc43e4c
Author | SHA1 | Date |
---|---|---|
Tero Paloheimo | c60cc43e4c | |
Tero Paloheimo | d1eadd380d |
|
@ -22,9 +22,10 @@ This module contains the entity classes used by Safe Eyes and its plugins.
|
|||
|
||||
import logging
|
||||
import random
|
||||
from distutils.version import LooseVersion
|
||||
from enum import Enum
|
||||
|
||||
from packaging.version import parse
|
||||
|
||||
from safeeyes import utility
|
||||
|
||||
|
||||
|
@ -323,7 +324,7 @@ class Config:
|
|||
else:
|
||||
user_config_version = str(
|
||||
meta_obj.get('config_version', '0.0.0'))
|
||||
if LooseVersion(user_config_version) != LooseVersion(system_config_version):
|
||||
if parse(user_config_version) != parse(system_config_version):
|
||||
# Update the user config
|
||||
self.__merge_dictionary(
|
||||
self.__user_config, self.__system_config)
|
||||
|
|
|
@ -32,7 +32,6 @@ import sys
|
|||
import shutil
|
||||
import subprocess
|
||||
import threading
|
||||
from distutils.version import LooseVersion
|
||||
from logging.handlers import RotatingFileHandler
|
||||
from pathlib import Path
|
||||
|
||||
|
@ -43,6 +42,7 @@ gi.require_version('Gtk', '3.0')
|
|||
from gi.repository import Gtk
|
||||
from gi.repository import GLib
|
||||
from gi.repository import GdkPixbuf
|
||||
from packaging.version import parse
|
||||
|
||||
gi.require_version('Gdk', '3.0')
|
||||
|
||||
|
@ -559,7 +559,7 @@ def __update_plugin_config(plugin, plugin_config, config):
|
|||
if plugin_config is None:
|
||||
config['plugins'].remove(plugin)
|
||||
else:
|
||||
if LooseVersion(plugin.get('version', '0.0.0')) != LooseVersion(plugin_config['meta']['version']):
|
||||
if parse(plugin.get('version', '0.0.0')) != parse(plugin_config['meta']['version']):
|
||||
# Update the configuration
|
||||
plugin['version'] = plugin_config['meta']['version']
|
||||
setting_ids = []
|
||||
|
|
Loading…
Reference in New Issue