fixup

Author: albu-diku

mig/shared/_env.py

@@ -0,0 +1,4 @@
+import os
+
+MIG_BASE = os.path.realpath(os.path.join(os.path.dirname(__file__), '../..'))
+MIG_ENV = os.getenv('MIG_ENV', 'default')

mig/shared/conf.py

@@ -32,6 +32,7 @@
 import os
 import sys
 
+from mig.shared._env import MIG_BASE
 from mig.shared.fileio import unpickle
 
 
@@ -43,17 +44,14 @@ def get_configuration_object(config_file=None, skip_log=False,
     """
     from mig.shared.configuration import Configuration
     if config_file:
+        # use config file path passed explicitly to the function
         _config_file = config_file
     elif os.environ.get('MIG_CONF', None):
+        # use config file explicitly set in the environment
         _config_file = os.environ['MIG_CONF']
     else:
-        app_dir = os.path.dirname(sys.argv[0])
-        if not app_dir:
-            _config_file = '../server/MiGserver.conf'
-        else:
-            _config_file = os.path.join(app_dir, '..', 'server',
-                    'MiGserver.conf')
-            _config_file = os.path.normpath(_config_file)
+        # find config file relative to the directory in which the scrip resides
+        _config_file = os.path.join(MIG_BASE, 'server/MiGserver.conf')
     configuration = Configuration(_config_file, False, skip_log,
                                   disable_auth_log)
     return configuration
@@ -62,7 +60,7 @@ def get_configuration_object(config_file=None, skip_log=False,
 def get_resource_configuration(resource_home, unique_resource_name,
                                logger):
     """Load a resource configuration from file"""
-    
+
     # open the configuration file
 
     resource_config_file = resource_home + '/' + unique_resource_name\

mig/shared/configuration.py

@@ -735,7 +735,7 @@ def reload_config(self, verbose, skip_log=False, disable_auth_log=False,
         else:
             print("""Could not find your configuration file (%s). You might
 need to point the MIG_CONF environment to your actual MiGserver.conf
-location.""" % self.config_file)
+location.""" % _config_file)
             raise IOError
 
         config = ConfigParser()

mig/shared/defaults.py

@@ -32,8 +32,7 @@
 import os
 import sys
 
-MIG_BASE = os.path.realpath(os.path.join(os.path.dirname(__file__), '../..'))
-MIG_ENV = os.getenv('MIG_ENV', 'default')
+from mig.shared._env import MIG_BASE, MIG_ENV
 
 # NOTE: python3 switched strings to use unicode by default in contrast to bytes
 #       in python2. File systems remain with utf8 however so we need to

tests/support/_env.py

@@ -1,3 +1,33 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# --- BEGIN_HEADER ---
+#
+# mig.shared._env - environment related consants only
+# Copyright (C) 2003-2024  The MiG Project lead by Brian Vinter
+#
+# This file is part of MiG.
+#
+# MiG is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# MiG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# -- END_HEADER ---
+#
+
+
+"""Environment consants separated from defaults to reduce import pollution."""
+
 import os
 import sys