git://git.onelab.eu
/
bootmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Be more careful in how we remove the PLCONF_DIR, especially for systems
[bootmanager.git]
/
source
/
steps
/
InstallInit.py
diff --git
a/source/steps/InstallInit.py
b/source/steps/InstallInit.py
index
70aa994
..
2e6b66b
100644
(file)
--- a/
source/steps/InstallInit.py
+++ b/
source/steps/InstallInit.py
@@
-7,11
+7,10
@@
# All rights reserved.
# expected /proc/partitions format
# All rights reserved.
# expected /proc/partitions format
-import os, sys, shutil
-import string
+import os, sys, string
import utils
import utils
-
+from Exceptions import *
def Run( vars, log ):
"""
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( 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
# create the temp path and sysimg path. since sysimg
# path is in temp path, both are created here