Quellcode durchsuchen

add global_conf to setting for both db init and db delete to fi database commands

Guénaël Muller vor 6 Jahren
Ursprung
Commit
4d1f9fbbfa
1 geänderte Dateien mit 2 neuen und 0 gelöschten Zeilen
  1. 2 0
      tracim/command/database.py

+ 2 - 0
tracim/command/database.py Datei anzeigen

46
         config_uri = parsed_args.config_file
46
         config_uri = parsed_args.config_file
47
         setup_logging(config_uri)
47
         setup_logging(config_uri)
48
         settings = get_appsettings(config_uri)
48
         settings = get_appsettings(config_uri)
49
+        settings.update(settings.global_conf)
49
         self._create_schema(settings)
50
         self._create_schema(settings)
50
         self._populate_database(settings, add_test_data=parsed_args.test_data)
51
         self._populate_database(settings, add_test_data=parsed_args.test_data)
51
 
52
 
113
         config_uri = parsed_args.config_file
114
         config_uri = parsed_args.config_file
114
         setup_logging(config_uri)
115
         setup_logging(config_uri)
115
         settings = get_appsettings(config_uri)
116
         settings = get_appsettings(config_uri)
117
+        settings.update(settings.global_conf)
116
         engine = get_engine(settings)
118
         engine = get_engine(settings)
117
         app_config = CFG(settings)
119
         app_config = CFG(settings)
118
         app_config.configure_filedepot()
120
         app_config.configure_filedepot()