[SCM] live-studio branch, master, updated. 25873fc551c6513a04636955407754fab5f3e56a
Chris Lamb
lamby at debian.org
Fri Jul 30 23:59:19 UTC 2010
The following commit has been merged in the master branch:
commit d6bd84590831b2da58cde411bf75f210e20df151
Author: Chris Lamb <lamby at debian.org>
Date: Fri Jul 30 19:55:49 2010 -0400
Ensure timezones are stored correctly
The postgres datetime fields are timezone aware so we need to
pass them local times (eg. datetime.datetime.now) or they will be
offset again when you pull them back out again. This doesn't
happen with the Django MySQL backend as the fields have no magic.
Signed-off-by: Chris Lamb <lamby at debian.org>
diff --git a/live_studio/build/management/commands/queue_runner.py b/live_studio/build/management/commands/queue_runner.py
index 3b65331..2525a11 100644
--- a/live_studio/build/management/commands/queue_runner.py
+++ b/live_studio/build/management/commands/queue_runner.py
@@ -48,7 +48,7 @@ class Command(NoArgsCommand):
self.log.debug('Updating #%d with %r', build.pk, kwargs)
Build.objects.filter(pk=build.pk).update(**kwargs)
- update(started=datetime.datetime.utcnow())
+ update(started=datetime.datetime.now())
tempdir = tempfile.mkdtemp(prefix='live-studio_')
target_dir = os.path.join(settings.BUILDS_ROOT, build.ident)
@@ -85,13 +85,13 @@ class Command(NoArgsCommand):
assert filename, "Did not create any image"
update(
- finished=datetime.datetime.utcnow(),
+ finished=datetime.datetime.now(),
filename=filename,
)
self.log.info("#%d built successfully", build.pk)
except:
- update(finished=datetime.datetime.utcnow())
+ update(finished=datetime.datetime.now())
self.log.exception("#%d failed", build.pk)
continue
finally:
diff --git a/live_studio/build/models.py b/live_studio/build/models.py
index 03bb3d7..1748df8 100644
--- a/live_studio/build/models.py
+++ b/live_studio/build/models.py
@@ -11,7 +11,7 @@ class Build(models.Model):
config = models.ForeignKey('config.Config', related_name='builds')
- enqueued = models.DateTimeField(default=datetime.datetime.utcnow)
+ enqueued = models.DateTimeField(default=datetime.datetime.now)
started = models.DateTimeField(null=True)
finished = models.DateTimeField(null=True)
diff --git a/live_studio/config/models.py b/live_studio/config/models.py
index e270eec..c7daf30 100644
--- a/live_studio/config/models.py
+++ b/live_studio/config/models.py
@@ -7,7 +7,7 @@ from live_studio import data
class Config(models.Model):
user = models.ForeignKey(User, related_name='configs')
- created = models.DateTimeField(default=datetime.datetime.utcnow)
+ created = models.DateTimeField(default=datetime.datetime.now)
name = models.CharField(
max_length=150,
--
live-studio
More information about the debian-live-changes
mailing list