From: zuber <marek@stepniowski.com>
Date: Sat, 10 Oct 2009 23:10:20 +0000 (+0200)
Subject: Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/46fdcc29313a6c0dd897b8060335061f433897fd?hp=1a65a8d09e07f68e9dde662430719cfa84a0fd77

Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

Conflicts:
	fabfile.py
---

diff --git a/fabfile.py b/fabfile.py
index 5f9cd3fe..6304aaea 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -1,14 +1,15 @@
 from __future__ import with_statement
+from fabric.api import *
 
-from fabric.api import run, env, cd
 
 def staging():
-    '''Add staging server to hosts'''
+    '''Use staging server'''
     env.hosts = ['platforma@stigma.nowoczesnapolska.org.pl:2222']
     env.project_dir = '/home/platforma/platforma'
 
 def deploy():
     '''Deploy server'''
+    require('project_dir', provided_by=['staging'])
     with cd(env.project_dir):
         run('git pull')
         run('./project/manage.py syncdb')
diff --git a/requirements.txt b/requirements.txt
index bff92e57..145ea16d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 Django==1.1
 django-piston==0.2.3rc1
-librarian==1.2.2
+librarian==1.2.5
 lxml==2.2.2
 mercurial==1.3.1
 -e git://github.com/zuber/django-cas-consumer.git#egg=django-cas-consumer
\ No newline at end of file