Commit c7432b6a authored by Huihui, Jonathan's avatar Huihui, Jonathan
Browse files

fix conflict

parent b903d157

src/common/env.py

+28 −4
Original line number Diff line number Diff line
@@ -28,10 +28,8 @@ def check_environment(env_var, default=None): 
    """

    if env_var in os.environ:

        if isinstance(default, bool):

            os.environ[env_var] = str(default)

            return boolify(os.environ[env_var])

        if isinstance(default, int):

            os.environ[env_var] = str(default)

            return int(os.environ[env_var])

        return os.environ[env_var]

    # assume if in python environment, it is already a bool or int
@@ -41,14 +39,19 @@ def check_environment(env_var, default=None): 
    if env_var in locals():

        os.environ[env_var] = str(locals()[env_var])

        return locals()[env_var]

    if default is not None:

        os.environ[env_var] = str(default)

    #if default is not None:

    #    os.environ[env_var] = str(default)

    return default





def check_multi_environment(env_var, value, env_var_multi, multi_value):

<<<<<<< HEAD

    """ Check if an environment variable has been set using the vanilla

    method, if so, do nothing. If not, check if the modified variable

=======

    """ Check if an environment variable exists,

    if so, do nothing. If not, check if the modified variable

>>>>>>> 4361717 (fix logic)

    has been specified and return that value instead.



    :param env_var: the vanilla environment variable to look for
@@ -63,8 +66,29 @@ def check_multi_environment(env_var, value, env_var_multi, multi_value): 
    

=======

    # assume check environment has already been run on the init

    # and that this process can access that variable??

    

    # check for existence, if it doesn't exist, return multi_value

    # if os.environ[env_var] == str(value):

    if isinstance(os.environ[env_var], str):

        if isinstance(multi_value, bool):

            return boolify(os.environ[env_var_multi])

        if isinstance(multi_value, int):

            return int(os.environ[env_var_multi])

        # assume if in python environment, it is already a bool or int

        if env_var_multi in globals():

            return globals()[env_var_multi]

        if env_var_multi in locals():

            return locals()[env_var_multi]

    

    # by now:

    # exists - just return value - we don't need to set

    return os.environ[env_var]



<<<<<<< HEAD

>>>>>>> a9803b5 (fix to if default is not none)



    return True

>>>>>>> 07f2a66 (add env var if default is returned)

=======

>>>>>>> 4361717 (fix logic)