Changeset 338 for cleverbox/trunk/cleverbox

Timestamp:

05/03/08 09:55:04 (4 years ago)

Author:

trivoallan

Message:

cleverbox :

• fixed Cleverbox does not work if trac-admin script is in a non standard location (#48)
• fixed trac version dependency in setup.py
• debian packaging : binary-install actions should go in postinst file (#46)
• debian packaging : added python-setuptools to build dependencies

all fixes on both trunk and 0.4 branch.

Files:

• cleverbox/trunk/cleverbox/model/project.py (modified) (13 diffs)

cleverbox/trunk/cleverbox/model/project.py

@@ -36 +36 @@
     If "status" parameter has a value (either "enabled" or "disabled"), returned list is limited to project with this status.
     """
-    
+
     list_projects = []
 
@@ -72 +72 @@
     if not exists(environment, client_name, project_name):
         raise Exception, 'Client "%s" has no project "%s".' % (client_name, project_name)
-    
+
     try:
         os.unlink(os.path.join(environment.get_path('projects-enabled'), '%s-%s' % (client_name, project_name)))
@@ -85 +85 @@
     Enables project in environment.
     """
-    
+
     if not exists(environment, client_name, project_name):
         raise Exception, 'Client "%s" has no project "%s"' % (client_name, project_name)
-    
+
     target = os.path.join(environment.get_path('projects-available'),
                           '%s-%s' % (client_name, project_name))
@@ -104 +104 @@
     Creates a new project for client in environment.
     """
-    
+
     # Merging for consistency
     parameters['client'] = client_name
@@ -146 +146 @@
         # -- Modifies Trac default conf
         _trac_defaultconf(environment, parameters)
-        
+
         # -- Fix perms
         _fix_perms(environment, parameters)
@@ -217 +217 @@
                  'trac_install_dir' : environment.config.get('trac', 'lib_dir')}
 
-    trac_cmd = '/usr/bin/trac-admin %(env_path)s initenv %(title)s %(db_dsn)s svn %(svn_path)s %(templates_path)s' % cmd_data
+    trac_cmd = 'trac-admin %(env_path)s initenv %(title)s %(db_dsn)s svn %(svn_path)s %(templates_path)s' % cmd_data
 
     (stdin, stdout, stderr) = os.popen3( trac_cmd )
@@ -239 +239 @@
     perms_config = ConfigParser.SafeConfigParser()
     perms_config.read(os.path.join(environment.path, 'profiles', infos['profile'], 'permissions.ini'))
-    
+
     # Grant permissions as defined in permissions.ini
     for profile in perms_config.options('trac'):
@@ -253 +253 @@
                                  'subject'    : admin_login,
                                  'perms'      : 'TRAC_ADMIN'} )
-    
+
     print "  Trac initial permissions set (admin rights given to '%s')\n" % admin_login
 
 def _trac_revoke_all_perms(environment, infos):
     import trac.env
-    
+
     trac_env_path = os.path.join( environment.config.get('general', 'clients_root'),
                                  infos['client'],
                                  'var/trac',
                                  infos['short_name'] )
-    
+
     # Revoke all permissions
     trac_env = trac.env.open_environment(trac_env_path)
@@ -270 +270 @@
     db_cursor.execute('DELETE FROM permission')
     trac_db.commit()
-    
+
     print "  Revoked Trac default permissions\n"
 
@@ -278 +278 @@
     client_name = infos['client']
     project_name = infos['short_name']
-    
+
     permissions = {
         os.path.join(environment.get_path(), 'projects-available', client_name + '-' + project_name)   : (0640, 'root', 'root'),
@@ -299 +299 @@
     Overrides project's default trac.ini with values provided in configuration profile.
     """
-    
+
     # New defaults
     tracdefaults_config = ConfigParser.SafeConfigParser()
     tracdefaults_config.read(os.path.join(environment.path, 'profiles', infos['profile'], 'trac-defaults.ini'))
-    
+
     # Trac base config file
     project_config_path = os.path.join(environment.config.get('general', 'clients_root'), infos['client'], 'var', 'trac', infos['short_name'], 'conf', 'trac.ini')
@@ -318 +318 @@
             default_option = tracdefaults_config.get(section, option)
             tracproject_config.set(section, option, default_option)
-            
+
     # Add cleverbox section
     # The variables in this section can be used for string substitution across the file
@@ -326 +326 @@
                          'authbackend_pass' : environment.config.get('general', 'authbackend_pass'),
                          'trac_install_dir' : environment.config.get('trac', 'lib_dir'),
-                         'domain_name'      : environment.config.get('general', 'domain')} 
+                         'domain_name'      : environment.config.get('general', 'domain')}
     tracproject_config.add_section('cleverbox')
     for (option, value) in cleverbox_options.items():