From c03edb1ddc9cc18bd9aab31dae2600dfaf5a8d03 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Wed, 22 Nov 2006 19:23:50 +0000 Subject: [PATCH] Be more careful in how we remove the PLCONF_DIR, especially for systems that use the readonly cramfs. --- source/steps/InstallInit.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/source/steps/InstallInit.py b/source/steps/InstallInit.py index 70aa994..2e6b66b 100644 --- a/source/steps/InstallInit.py +++ b/source/steps/InstallInit.py @@ -7,11 +7,10 @@ # All rights reserved. # expected /proc/partitions format -import os, sys, shutil -import string +import os, sys, string import utils - +from Exceptions import * def Run( vars, log ): """ @@ -75,7 +74,12 @@ def Run( vars, log ): utils.removedir( TEMP_PATH ) log.write( "Cleaning up any existing PlanetLab config files\n" ) - utils.removedir( PLCONF_DIR ) + try: + flist = os.listdir( PLCONF_DIR) + for file in flist: + utils.removedir( file ) + except OSError: + pass # create the temp path and sysimg path. since sysimg # path is in temp path, both are created here -- 2.43.0