CLOUDSTACK-6298:[Windows] if already tmp directory exists inject keys is dailing on widows while starting the management server
Signed-off-by: Abhinandan Prateek <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b814783a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b814783a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b814783a Branch: refs/heads/master Commit: b814783a636307bf73d359248ce33d541f534fda Parents: 54d3a3d Author: Damodar Reddy <[email protected]> Authored: Tue Apr 15 15:19:15 2014 +0530 Committer: Abhinandan Prateek <[email protected]> Committed: Wed Apr 16 11:07:55 2014 +0530 ---------------------------------------------------------------------- scripts/vm/systemvm/injectkeys.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b814783a/scripts/vm/systemvm/injectkeys.py ---------------------------------------------------------------------- diff --git a/scripts/vm/systemvm/injectkeys.py b/scripts/vm/systemvm/injectkeys.py index bd840f9..0892255 100644 --- a/scripts/vm/systemvm/injectkeys.py +++ b/scripts/vm/systemvm/injectkeys.py @@ -31,9 +31,11 @@ import subprocess import commands import traceback import filecmp +import tempfile pathSep=os.sep -TMP=os.path.expanduser("~") + os.sep + "tmp" #Get Home Directory +TMP=tempfile.gettempdir() + os.sep + "tmp" #Get Home Directory +print("Temp Directory is : %s" % TMP) MOUNTPATH=TMP + pathSep + "systemvm_mnt" TMPDIR=TMP + pathSep + "cloud" + pathSep + "systemvm" osType=os.name @@ -81,7 +83,7 @@ def inject_into_iso(pubKey,systemiso): try : shutil.copytree(MOUNTPATH, TMPDIR) except : - print ("Failed to copy from original iso %s" % isofile) + print ("Failed to copy from original iso %s to %s" % (MOUNTPATH, TMPDIR)) clean_up() sys.exit(IOError) try :
