Repository: cloudstack Updated Branches: refs/heads/master e9e8c65b4 -> 06d510abc
CLOUDSTACK-6492: fixed localtime import and its usage in deployDataCenter.py Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/06d510ab Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/06d510ab Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/06d510ab Branch: refs/heads/master Commit: 06d510abcc361e728b456fde682c6ba1054f74ca Parents: e9e8c65 Author: SrikanteswaraRao Talluri <[email protected]> Authored: Thu Apr 24 18:59:52 2014 +0530 Committer: SrikanteswaraRao Talluri <[email protected]> Committed: Thu Apr 24 18:59:52 2014 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/deployDataCenter.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/06d510ab/tools/marvin/marvin/deployDataCenter.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index b241d15..31f663e 100644 --- a/tools/marvin/marvin/deployDataCenter.py +++ b/tools/marvin/marvin/deployDataCenter.py @@ -36,7 +36,7 @@ from marvin.config.test_data import test_data from sys import exit import os import pickle -from time import sleep, time, strftime +from time import sleep, strftime, localtime from optparse import OptionParser @@ -67,8 +67,7 @@ class DeployDataCenters(object): if self.__logFolderPath: dc_file_path = self.__logFolderPath + "/dc_entries.obj" else: - ts = strftime("%b_%d_%Y_%H_%M_%S", - time.localtime()) + ts = strftime("%b_%d_%Y_%H_%M_%S", localtime()) dc_file_path = "dc_entries_" + str(ts) + ".obj" file_to_write = open(dc_file_path, 'w') if file_to_write:
