From 0f2a0d63b876a0c04d0da8c47fe09bdde2a2d43f Mon Sep 17 00:00:00 2001
From: "Kenneth C. Arnold" <kcarnold@alum.mit.edu>
Date: Fri, 10 Jun 2011 14:45:39 -0400
Subject: [PATCH] Use rsync explicitly.

---
 divisi2         | 2 +-
 docs/fabfile.py | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/divisi2 b/divisi2
index 3550c73..271b965 160000
--- a/divisi2
+++ b/divisi2
@@ -1 +1 @@
-Subproject commit 3550c7388ce426435a3179002907f02d086e57f1
+Subproject commit 271b965100a83dc91251344d09a0f37579ffc316
diff --git a/docs/fabfile.py b/docs/fabfile.py
index e3e9f2f..3531d0b 100644
--- a/docs/fabfile.py
+++ b/docs/fabfile.py
@@ -1,6 +1,5 @@
 from __future__ import with_statement
 from fabric.api import *
-from fabric.contrib.project import rsync_project
 
 env.hosts = ['anemone.media.mit.edu']
 
@@ -14,7 +13,11 @@ def deploy():
 def update_server():
     # later, make this assemble things on the server side
     # this requires understanding how it's set up, though
-    rsync_project(local_dir='_build/html/', remote_dir='/srv/csc/cscweb/static/docs/')
+    #
+    # Not using some of the rsync_project options:
+    # -p, --perms                 preserve permissions
+    # -t, --times                 preserve times
+    local('rsync --del -hrvz _build/html/ %s:/srv/csc/cscweb/static/docs/' % env.host, capture=False)
 
 def push():
     build_docs()