Merge branch 'master' of github.com:mozilla/FlightDeck

clouserw · Jul 7, 2011 · a8bdfa8 · a8bdfa8
2 parents 5341c86 + e0146f9
commit a8bdfa8
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/apps/jetpack/models.py b/apps/jetpack/models.py
@@ -557,10 +557,10 @@ def save_new_revision(self, package=None, **kwargs):
         self.revision_number = self.get_next_revision_number()
 
         save_return = super(PackageRevision, self).save(**kwargs)
-        
+
         # reset commit_message list
         self._commit_messages = []
-        
+
         # reassign all dependencies
         for dep in origin.dependencies.all():
             self.dependencies.add(dep)
@@ -1185,7 +1185,7 @@ def build_xpi(self, modules=[], attachments=[], hashtag=None, rapid=False,
                     e_mod.export_code(lib_dir)
             if not mod_edited:
                 mod.export_code(lib_dir)
-        t2 = (time.time() * 1000) - t1
+        t2 = (time.time() - (t1 / 1000) - tstart) * 1000
         statsd.timing('xpi.build.modules', t2)
         log.debug("[xpi:%s] modules exported (time %dms)" % (hashtag, t2))
 
@@ -1200,13 +1200,13 @@ def build_xpi(self, modules=[], attachments=[], hashtag=None, rapid=False,
                     e_att.export_code(data_dir)
             if not att_edited:
                 att.export_file(data_dir)
-        t3 = (time.time() * 1000) - t2
+        t3 = (time.time() - (t2 / 1000) - tstart) * 1000
         statsd.timing('xpi.build.attachments', t3)
         log.debug("[xpi:%s] attachments exported (time %dms)" % (hashtag, t3))
 
         # XPI: copying to local from memory/db/files
         self.export_dependencies(packages_dir, sdk=self.sdk)
-        t4 = (time.time() * 1000) - t3
+        t4 = (time.time() - (t3 / 1000) - tstart) * 1000
         statsd.timing('xpi.build.dependencies', t4)
         log.debug("[xpi:%s] dependencies exported (time %dms)" % (hashtag, t4))