update, fix pm script

diff --git a/install.py b/install.py
index 515ee3f49f98329466f0527a05b13e5f35f123d3..3c144e83a50f4e8e5cde193bc5f674f5d8cc83c8 100755 (executable)
--- a/install.py
+++ b/install.py
@@ -116,6 +116,9 @@ class Install(object):
         os.system('a2ensite telecaster.conf')
         os.system('/etc/init.d/apache2 reload')
 
+        dir = '/etc/pm/'
+        os.system('cp -r conf' + dir + '* ' + dir)
+
     def install_init(self):
         os.chdir(self.app_dir)
 

diff --git a/telecaster.py b/telecaster.py
index ff66ccd7da52bc203224e71ddc5fefe9250dfb1a..123663b2e388be8625895d2fe8db0fe198b3a624 100755 (executable)
--- a/telecaster.py
+++ b/telecaster.py
@@ -35,7 +35,7 @@
 # Author: Guillaume Pellerin <yomguy@parisson.com>
 """
 
-version = '0.5.5'
+version = '0.5.6'
 
 import os
 import re
@@ -73,7 +73,7 @@ class TeleCaster:
             self.deefuzzer_path = '/usr/local/bin/deefuzzer'
         elif os.path.exists('/usr/bin/deefuzzer'):
             self.deefuzzer_path = '/usr/bin/deefuzzer'
-            
+
     def transition_head(self):
         html_file = open('telecaster_starting_head.html', 'r')
         html = html_file.read()
@@ -88,7 +88,7 @@ class TeleCaster:
 
     def main(self):
         edcast_pid = get_pid('edcast_jack', self.uid)
-        
+
         deefuzzer_pid = get_pid(self.deefuzzer_path+' '+self.user_dir+os.sep+'deefuzzer.xml', self.uid)
         writing = edcast_pid != []
         casting = deefuzzer_pid != []
@@ -104,7 +104,7 @@ class TeleCaster:
                         'session': '',
                         'professor': '',
                         'comment': ''}
-                        
+
             for data in self.conference_dict:
                 if not form.has_key(data):
                     self.conference_dict[data] = 'Inconnu'
@@ -113,7 +113,7 @@ class TeleCaster:
                     if '....' in value:
                         self.conference_dict[data] = 'Inconnu'
                     else:
-                        value = re.sub(r'\W+', '_', value) 
+                        value = re.sub(r'\W+', '_', value)
                         self.conference_dict[data] = value.decode('utf-8')
 
             self.conference_dict['title'] = self.title