handle non-existant demo dir (thanks Ollie Rutherfurd)

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1712 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/CHANGES.txt b/CHANGES.txt
index bb7e78a4b57097f12716a6d4968a3f0b8876aa50..75d2a00a41f0cee0a8a2625e3ddf22cc46c7a0af 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,9 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
-2003-??-?? 0.6.0
+2003-05-?? 0.6.0
 Fixed:
+- handle non-existant demo dir (thanks Ollie Rutherfurd)
 - strip whitespace from Role names so "User, Admin" will work
 
 

diff --git a/demo.py b/demo.py
index 299133a21fdf9cedcfe394036f65773f65e55e8f..0c601dcb72061ac39e39cb502039f004c5f48ee3 100644 (file)
--- a/demo.py
+++ b/demo.py
@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2003 Richard Jones (richard@mechanicalcat.net)
 # 
-# $Id: demo.py,v 1.1 2003-05-09 05:04:33 richard Exp $
+# $Id: demo.py,v 1.2 2003-05-11 07:33:55 richard Exp $
 
 import sys, os, string, re, urlparse
 import shutil, socket, errno, BaseHTTPServer
@@ -11,7 +11,8 @@ from glob import glob
 def install_demo(home):
     # create the instance
     try:
-        shutil.rmtree(home)
+        if os.path.exists(home):
+            shutil.rmtree(home)
     except os.error, error:
         if error.errno != errno.ENOENT:
             raise

diff --git a/doc/index.txt b/doc/index.txt
index dc02cc2f7c0e68f10f6547ff5b81469510844888..7d429bf5bfc982350d99a4fbb49734950c632e00 100644 (file)
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -75,6 +75,7 @@ Will Partain,
 Ewout Prangsma,
 Bernhard Reiter,
 John P. Rouillard,
+Ollie Rutherfurd,
 Florian Schulze,
 Dougal Scott,
 Stefan Seefeld,