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

fix conflict

parent 97f819c1

src/common/env.py

+7 −0
Original line number Diff line number Diff line
@@ -28,8 +28,10 @@ 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
@@ -54,10 +56,15 @@ def check_multi_environment(env_var, value, env_var_multi, multi_value): 
    :param env_var_multi: the modified environment variable to look for

    :param multi_value: the value of the modified environmental

    """

<<<<<<< HEAD

<<<<<<< HEAD

    return True

=======

    

=======

    # assume check environment has already been run on the init



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



    return True

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