Bugfix in various loader & bootstrap functions

Now we are able to generate dyncode for lodelsites and handled sites (
tested with only 1 handled site) using lodel_admin.py dyncode -a

lodel/bootstrap.py

@@ -141,7 +141,9 @@ def site_preload(data_path, confdir_basename = 'conf.d', lodelsites_instance = F
         LodelFatalError('Bad argument given to site_load(). This really \
 sux !')
     #Determining uniq sitename from data_path
-    data_path = os.path.dirname(data_path).rstrip('/') #else basename returns ''
+    data_path = data_path.rstrip('/')
+    if lodelsites_instance:
+        data_path = os.path.dirname(data_path).rstrip('/')
     ctx_name = os.path.basename(data_path)
     if not os.path.exists(data_path) or not os.path.isdir(data_path):
         LodelContext.expose_modules(globals(), {
@@ -150,7 +152,7 @@ sux !')
     #Immediately switching to the context
     LodelContext.new(ctx_name)
     LodelContext.set(ctx_name)
-    os.chdir(data_path) #Now the confdir is ./$condir_basename
+    confdir = os.path.join(data_path, confdir_basename)
     #Loading settings for current site
     LodelContext.expose_modules(globals(), {
         'lodel.settings.settings': [('Settings', 'settings_preloader')]})
@@ -164,10 +166,10 @@ This should not append !' % ctx_name
     if lodelsites_instance:
         #fetching custom confspec
         custom_confspec = _get_confspec("dummy_argument_is_obsolete")
-        settings_preloader(os.path.join('./', confdir_basename),
+        settings_preloader(os.path.join('./', confdir),
             custom_confspec, True)
     else:
-        settings_preloader(os.path.join('./', confdir_basename))
+        settings_preloader(os.path.join('./', confdir))
     LodelContext.set(None)
     return
 

lodel/plugin/core_scripts.py

@@ -365,15 +365,17 @@ class RefreshDyncode(LodelScript):
             })
             handled_sites = get_handled_sites_name()
             del(globals()['get_handled_sites_name'])
-            lodlesites_path = os.path.join(buildconf.LODEL2VARDIR,
+            lodlesites_path = os.path.join(
+                os.path.join(buildconf.LODEL2VARDIR, lodelsites_name),
                 buildconf.MULTISITE_CONTEXTDIR)
             if handled_sites is not None:
                 for sitename in handled_sites:
                     LodelContext.set(None)
                     #construct dyncode filename
+                    ##@todo fetch dyncode filename from handled site conf
                     dyncode_path = os.path.join(
                         os.path.join(lodlesites_path, sitename),
-                        'leapi_dyncode') #BOO hardcoded dyncode file name
+                        'leapi_dyncode.py') #BOO hardcoded dyncode file name
                     cls.refresh_dyncode(emfile_path, dyncode_path,
                         em_translator)
         #Refresh only one dyncode

lodel/settings/settings_loader.py

@@ -25,6 +25,9 @@ class SettingsLoader(object):
     # @param conf_path str : conf.d path
     def __init__(self, conf_path):
         self.__conf_path = conf_path
+        if not os.path.isdir(conf_path):
+            logger.warning("Configuration directory %s do not exists. Using \
+default configuration values (cwd : %s)" % (conf_path, os.getcwd()))
         self.__conf_sv = dict()
         self.__conf = self.__merge()
         # Stores errors

progs/slim/install_model/lodel_admin.py

@@ -172,9 +172,7 @@ leapi_dyncode. Abording handled sites preloading")
         del(globals()['logger'])
         del(globals()['LodelException'])
         for sitename in handled_sites:
-            datapath = os.path.join(
-                os.path.join(lodel.buildconf.LODEL2VARDIR, sitename),
-                lodel.buildconf.MULTISITE_DATADIR)
+            datapath = os.path.join(lodelsites_datapath, sitename)
             site_preload(datapath)
     else:
         bootstrap.bootstrap()