From 376b258d4df606a5bb54107e58bfd0929062d3a2 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Thu, 19 Jul 2012 21:37:14 +0200
Subject: [PATCH] for teleforma 0.7-dev

---
 collect.sh   |   4 ++++
 gitmanage.py |  11 ++++++++++-
 settings.py  |   2 +-
 settings.pyc | Bin 5530 -> 5511 bytes
 4 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100755 collect.sh

diff --git a/collect.sh b/collect.sh
new file mode 100755
index 0000000..c779fa6
--- /dev/null
+++ b/collect.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+./manage.py collectstatic --ignore archives --ignore Pre-Barreau --ignore cache
+
diff --git a/gitmanage.py b/gitmanage.py
index 40d6128..f782d74 100644
--- a/gitmanage.py
+++ b/gitmanage.py
@@ -15,7 +15,8 @@ class GitManage(object):
                 print app
                 os.chdir(self.dir + os.sep + app)
                 os.system('git ' + args)
-        os.chdir(self.dir)
+                print ''
+                os.chdir(self.dir)
 
     def pull(self, repo, branch):
         args = 'pull ' + repo + ' ' + branch
@@ -33,6 +34,14 @@ class GitManage(object):
         args = 'remote -v'
         self.process(args)
 
+    def show(self):
+        args = 'show'
+        self.process(args)
+
+    def head(self):
+        args = 'diff-tree -s HEAD'
+        self.process(args)
+
     def add_repo(self, name, repo):
         for app in self.apps:
             if not app in self.exclude and os.path.isdir(self.dir + os.sep + app):
diff --git a/settings.py b/settings.py
index cacde6c..3374a5a 100644
--- a/settings.py
+++ b/settings.py
@@ -182,6 +182,6 @@ POSTMAN_AUTO_MODERATE_AS = True
 TELECASTER_CONF = [{'type':'mp3','server_type':'icecast','conf':'/etc/telecaster/deefuzzer_mp3.xml', 'port':'8000'},
                    {'type':'webm','server_type':'stream-m','conf':'/etc/telecaster/deefuzzer_webm.xml', 'port':'8080'}, ]
 
-TELECASTER_RSYNC_SERVER = 'telecaster@jimi.parisson.com:archives/'+TELEMETA_ORGANIZATION+'/'
+TELECASTER_RSYNC_SERVER = 'telecaster@192.168.0.31:archives/'
 TELECASTER_RSYNC_LOG = '/home/telecaster/logs/rsync.log'
 
diff --git a/settings.pyc b/settings.pyc
index 933a942bc219c498a83e54279a71d49b9385b96f..c958dffa5b5c5d2deecf3670b437fc74626ebb8f 100644
GIT binary patch
delta 189
zcmXYqPYc0t9EU$cXeAf(Z%Rs0Y8jb7r^(Spar&NU-yg>O+vF`cuid-}ir3@~xXTWn
zdU}q}t#NIr(N9W#_mdL~f0VFhsQ2;JVQdLr`SWpX4YvJztGfYZz*~?4E`zdQ2b2TX
zKzVQ-Q~>WlMerV^f=8ed_z>i!PT~lvf=|IrdZeiX79ayGVOn>eYUGuyR>JLBIKo<Z
fXW^Q9zoqF$PityzeXww?wS5uZ^DE!vNL=~>)Bi0{

delta 208
zcmXYqO{)Q67>4f`MN@2i3`W_UP>Pa|IxDiYQLLVoX`UA^#xU>XFIZ1@{=`wvFS50?
zv@r{JU0s{2?sN0nwBoO{@#w~<4!+Ar9!BVQXpIsp@H$*f5(>Nt|2l&$C<oqw^580{
z0CqtpxDG0U8=w++4=RH_kOdxtD&WJVD0;~w=m+dy=Hh0`3QU$TsRv$y`e1=sL*KKp
v|5Upc-3M|f9a{&|A8wSZS_j)#T6_DJ<GH`K@2u5H>UJQa^!_xiMl2&ffP*vB

-- 
2.39.5