diff rhodecode/config/environment.py @ 4116:ffd45b185016 rhodecode-2.2.5-gpl

Imported some of the GPLv3'd changes from RhodeCode v2.2.5. This imports changes between changesets 21af6c4eab3d and 6177597791c2 in RhodeCode's original repository, including only changes to Python files and HTML. RhodeCode clearly licensed its changes to these files under GPLv3 in their /LICENSE file, which states the following: The Python code and integrated HTML are licensed under the GPLv3 license. (See: https://code.rhodecode.com/rhodecode/files/v2.2.5/LICENSE or http://web.archive.org/web/20140512193334/https://code.rhodecode.com/rhodecode/files/f3b123159901f15426d18e3dc395e8369f70ebe0/LICENSE for an online copy of that LICENSE file) Conservancy reviewed these changes and confirmed that they can be licensed as a whole to the Kallithea project under GPLv3-only. While some of the contents committed herein are clearly licensed GPLv3-or-later, on the whole we must assume the are GPLv3-only, since the statement above from RhodeCode indicates that they intend GPLv3-only as their license, per GPLv3ยง14 and other relevant sections of GPLv3.
author Bradley M. Kuhn <bkuhn@sfconservancy.org>
date Wed, 02 Jul 2014 19:03:13 -0400
parents 5293d4bbb1ea
children 7e5f8c12a3fc
line wrap: on
line diff
--- a/rhodecode/config/environment.py	Wed Jul 02 19:03:10 2014 -0400
+++ b/rhodecode/config/environment.py	Wed Jul 02 19:03:13 2014 -0400
@@ -1,8 +1,24 @@
-"""Pylons environment configuration"""
+# -*- coding: utf-8 -*-
+# This program 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 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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, see <http://www.gnu.org/licenses/>.
+"""
+    Pylons environment configuration
+"""
 
 import os
 import logging
 import rhodecode
+import platform
 
 from mako.lookup import TemplateLookup
 from pylons.configuration import PylonsConfig
@@ -27,7 +43,8 @@
 log = logging.getLogger(__name__)
 
 
-def load_environment(global_conf, app_conf, initial=False):
+def load_environment(global_conf, app_conf, initial=False,
+                     test_env=None, test_index=None):
     """
     Configure the Pylons environment via the ``pylons.config``
     object
@@ -73,18 +90,22 @@
     config['pylons.strict_tmpl_context'] = True
     test = os.path.split(config['__file__'])[-1] == 'test.ini'
     if test:
+        if test_env is None:
+            test_env = not int(os.environ.get('RC_NO_TMP_PATH', 0))
+        if test_index is None:
+            test_index = not int(os.environ.get('RC_WHOOSH_TEST_DISABLE', 0))
         if os.environ.get('TEST_DB'):
             # swap config if we pass enviroment variable
             config['sqlalchemy.db1.url'] = os.environ.get('TEST_DB')
 
         from rhodecode.lib.utils import create_test_env, create_test_index
-        from rhodecode.tests import  TESTS_TMP_PATH
-        # set RC_NO_TMP_PATH=1 to disable re-creating the database and
-        # test repos
-        if not int(os.environ.get('RC_NO_TMP_PATH', 0)):
+        from rhodecode.tests import TESTS_TMP_PATH
+        #set RC_NO_TMP_PATH=1 to disable re-creating the database and
+        #test repos
+        if test_env:
             create_test_env(TESTS_TMP_PATH, config)
-        # set RC_WHOOSH_TEST_DISABLE=1 to disable whoosh index during tests
-        if not int(os.environ.get('RC_WHOOSH_TEST_DISABLE', 0)):
+        #set RC_WHOOSH_TEST_DISABLE=1 to disable whoosh index during tests
+        if test_index:
             create_test_index(TESTS_TMP_PATH, config, True)
 
     DbManage.check_waitress()
@@ -100,7 +121,7 @@
 
     instance_id = rhodecode.CONFIG.get('instance_id')
     if instance_id == '*':
-        instance_id = '%s-%s' % (os.uname()[1], os.getpid())
+        instance_id = '%s-%s' % (platform.uname()[1], os.getpid())
         rhodecode.CONFIG['instance_id'] = instance_id
 
     # CONFIGURATION OPTIONS HERE (note: all config options will override