Merge branch 'maint'

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

Conflicts:
	doc/installation/distributions.txt
	doc/server/snapshots/index.txt
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/sbin/bcfg2-server

2 files changed, 4 insertions, 4 deletions

diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py
index d9431dc63..d14696b68 100644
--- a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py
+++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py
@@ -70,7 +70,7 @@ class TestPOSIXDirectory(TestPOSIXTool):
         expected = [os.path.join(entry.get("name"), e)
                     for e in entries
                     if os.path.join(entry.get("name"), e) not in modlist]
-        actual = [e.get("path") for e in entry.findall("Prune")]
+        actual = [e.get("name") for e in entry.findall("Prune")]
         self.assertItemsEqual(expected, actual)
 
         mock_verify.reset_mock()
@@ -137,7 +137,7 @@ class TestPOSIXDirectory(TestPOSIXTool):
         entry.set("prune", "true")
         prune = ["/test/foo/bar/prune1", "/test/foo/bar/prune2"]
         for path in prune:
-            lxml.etree.SubElement(entry, "Prune", path=path)
+            lxml.etree.SubElement(entry, "Prune", name=path)
 
         reset()
         mock_install.return_value = True
@@ -145,6 +145,6 @@ class TestPOSIXDirectory(TestPOSIXTool):
         self.assertTrue(ptool.install(entry))
         ptool._exists.assert_called_with(entry)
         mock_install.assert_called_with(ptool, entry)
-        self.assertItemsEqual([c[0][0].get("path")
+        self.assertItemsEqual([c[0][0].get("name")
                                for c in ptool._remove.call_args_list],
                               prune)
diff --git a/testsuite/install.sh b/testsuite/install.sh
index 1e0acbad6..43a6057c0 100755
--- a/testsuite/install.sh
+++ b/testsuite/install.sh
@@ -15,7 +15,7 @@ if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then
     if [[ ${PYVER:0:1} == "2" ]]; then
         # django supports py3k, but South doesn't, and the django bits
         # in bcfg2 require South
-        pip install cheetah 'django<1.5' South M2Crypto
+        pip install cheetah 'django<1.5' 'South<0.8' M2Crypto
     fi
 else
     # python < 2.6 requires M2Crypto for SSL communication, not just