On 04/18/2012 01:49 PM, Osier Yang wrote:
This should be caused by previous 'utils/utils.py' cleaning up
---
repos/domain/install_linux_cdrom.py | 6 +++---
repos/domain/install_linux_net.py | 6 +++---
repos/domain/install_windows_cdrom.py | 4 ++--
repos/remoteAccess/tls_setup.py | 8 ++++----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/repos/domain/install_linux_cdrom.py b/repos/domain/install_linux_cdrom.py
index cda5dce..97ffc47 100644
--- a/repos/domain/install_linux_cdrom.py
+++ b/repos/domain/install_linux_cdrom.py
@@ -53,7 +53,7 @@ def prepare_cdrom(*args):
if os.path.exists(new_dir):
logger.info("the folder exists, remove it")
- shutils.rmtree(new_dir)
+ shutil.rmtree(new_dir)
os.makedirs(new_dir)
logger.info("the directory is %s" % new_dir)
@@ -67,7 +67,7 @@ def prepare_cdrom(*args):
urllib.urlretrieve(ks, '%s/%s' % (new_dir, ks_name))[0]
logger.info("the url of kickstart is %s" % ks)
- shutils.copy('utils/ksiso.sh', new_dir)
+ shutil.copy('utils/ksiso.sh', new_dir)
src_path = os.getcwd()
logger.info("enter into the workshop folder: %s" % new_dir)
@@ -418,4 +418,4 @@ def install_linux_cdrom_clean(params):
elif guesttype == 'xenfv' or guesttype == 'kvm':
guest_dir = os.path.join(HOME_PATH, guestname)
if os.path.exists(guest_dir):
- shutils.rmtree(guest_dir)
+ shutil.rmtree(guest_dir)
diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py
index 63c0491..29ace99 100644
--- a/repos/domain/install_linux_net.py
+++ b/repos/domain/install_linux_net.py
@@ -98,7 +98,7 @@ def prepare_cdrom(*args):
if os.path.exists(new_dir):
logger.info("the folder exists, remove it")
- shutils.rmtree(new_dir)
+ shutil.rmtree(new_dir)
os.makedirs(new_dir)
logger.info("the directory is %s" % new_dir)
@@ -112,7 +112,7 @@ def prepare_cdrom(*args):
urllib.urlretrieve(ks, '%s/%s' % (new_dir, ks_name))[0]
logger.info("the url of kickstart is %s" % ks)
- shutils.copy('utils/ksiso.sh', new_dir)
+ shutil.copy('utils/ksiso.sh', new_dir)
src_path = os.getcwd()
logger.info("enter into the workshop folder: %s" % new_dir)
@@ -408,4 +408,4 @@ def install_linux_net_clean(params):
elif guesttype == 'xenfv':
guest_dir = os.path.join(HOME_PATH, guestname)
if os.path.exists(guest_dir):
- shutils.rmtree(guest_dir)
+ shutil.rmtree(guest_dir)
diff --git a/repos/domain/install_windows_cdrom.py b/repos/domain/install_windows_cdrom.py
index 83c7357..6f287d5 100644
--- a/repos/domain/install_windows_cdrom.py
+++ b/repos/domain/install_windows_cdrom.py
@@ -90,7 +90,7 @@ def prepare_floppy_image(guestname, guestos, guestarch,
floppy_mount = "/mnt/libvirt_floppy"
if os.path.exists(floppy_mount):
logger.info("the floppy mount point folder exists, remove it")
- shutils.rmtree(floppy_mount)
+ shutil.rmtree(floppy_mount)
logger.info("create mount point %s" % floppy_mount)
os.makedirs(floppy_mount)
@@ -113,7 +113,7 @@ def prepare_floppy_image(guestname, guestos, guestarch,
setup_file = 'winnt.bat'
setup_file_path = os.path.join(windows_unattended_path, setup_file)
setup_file_dest = os.path.join(floppy_mount, setup_file)
- shutils.copyfile(setup_file_path, setup_file_dest)
+ shutil.copyfile(setup_file_path, setup_file_dest)
source = os.path.join(windows_unattended_path, "%s_%s.sif" %
(guestos, guestarch))
diff --git a/repos/remoteAccess/tls_setup.py b/repos/remoteAccess/tls_setup.py
index 4661e03..7ce2e84 100644
--- a/repos/remoteAccess/tls_setup.py
+++ b/repos/remoteAccess/tls_setup.py
@@ -351,7 +351,7 @@ def tls_setup(params):
if params.has_key('pkipath'):
pkipath = params['pkipath']
if os.path.exists(pkipath):
- shutils.rmtree(pkipath)
+ shutil.rmtree(pkipath)
os.mkdir(pkipath)
@@ -371,7 +371,7 @@ def tls_setup(params):
return 1
if os.path.exists(TEMP_TLS_FOLDER):
- shutils.rmtree(TEMP_TLS_FOLDER)
+ shutil.rmtree(TEMP_TLS_FOLDER)
os.mkdir(TEMP_TLS_FOLDER)
@@ -413,7 +413,7 @@ def tls_setup(params):
def tls_setup_clean(params):
""" cleanup testing enviroment """
if os.path.exists(TEMP_TLS_FOLDER):
- shutils.rmtree(TEMP_TLS_FOLDER)
+ shutil.rmtree(TEMP_TLS_FOLDER)
logger = params['logger']
target_machine = params['target_machine']
@@ -435,7 +435,7 @@ def tls_setup_clean(params):
logger.error("failed to remove libvirt folder")
os.remove("%s/cacert.pem" % CA_FOLDER)
- shutils.rmtree(CERTIFICATE_FOLDER)
+ shutil.rmtree(CERTIFICATE_FOLDER)
if auth_tls == 'sasl':
saslpasswd2_delete = "%s -a libvirt -d %s" % (SASLPASSWD2, username)
ACK
Guannan Ren
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list