You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by aj...@apache.org on 2003/09/27 07:35:05 UTC
cvs commit: jakarta-gump/python/gump launcher.py context.py build.py
ajack 2003/09/26 22:35:05
Modified: python/gump launcher.py context.py build.py
Log:
Still reworking to syncDirectories
Revision Changes Path
1.5 +3 -1 jakarta-gump/python/gump/launcher.py
Index: launcher.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/launcher.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- launcher.py 25 Sep 2003 17:04:52 -0000 1.4
+++ launcher.py 27 Sep 2003 05:35:05 -0000 1.5
@@ -350,8 +350,10 @@
if os.path.exists(outputFile):
result.output=outputFile
- # Keep time information
+ # Keep time information
end_time=time.time()
+ result.start_time=start_time
+ result.end_time=end_time
result.elapsed=round(end_time-start_time,2)
# Restore environment.
1.12 +1 -16 jakarta-gump/python/gump/context.py
Index: context.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/context.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- context.py 26 Sep 2003 19:09:52 -0000 1.11
+++ context.py 27 Sep 2003 05:35:05 -0000 1.12
@@ -178,22 +178,7 @@
self.secs=secs
def elapsedTime(self):
- secs = self.secs or 0;
- if secs > 3600:
- hours = int(secs / 3600)
- secs %= 3600
- else:
- hours = 0
-
- if secs > 60:
- mins = int(secs / 60)
- secs %= 60
- else:
- mins = 0
-
- secs = int(round(secs,0))
-
- return (hours, mins, secs)
+ return secsToElapsedTime(self.secs or 0)
def overview(self):
overview=WorkItem.overview(self)
1.16 +4 -4 jakarta-gump/python/gump/build.py
Index: build.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/build.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.py 26 Sep 2003 21:47:22 -0000 1.15
+++ build.py 27 Sep 2003 05:35:05 -0000 1.16
@@ -159,7 +159,7 @@
mctxt.performedWork(work)
# Update Context w/ Results
- if not cmdResult.status==CMD_STATUS_SUCCESS:
+ if not work.result.status==CMD_STATUS_SUCCESS:
mctxt.propagateErrorState(STATUS_FAILED,REASON_SYNC_FAILED)
else:
mctxt.status=STATUS_SUCCESS