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=-c

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

Conflicts:
	fabfile.py
---

46fdcc29313a6c0dd897b8060335061f433897fd
diff --combined fabfile.py
index c06c50b5,5f9cd3fe..6304aaea
--- a/fabfile.py
+++ b/fabfile.py
@@@ -1,13 -1,14 +1,15 @@@
- from fabric.api import run, local, settings, abort, env, cd, require, abort
+ 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')