LocoLander

Merge lp:~ricardokirkner/locolander/fix-scan-project into lp:locolander

  1. fix-scan-project
  2. Merge into trunk
Proposed by Ricardo Kirkner
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: 31
Merged at revision: 29
Proposed branch: lp:~ricardokirkner/locolander/fix-scan-project
Merge into: lp:locolander
Prerequisite: lp:~ricardokirkner/locolander/lean-output
Diff against target: 21 lines (+7/-1)
1 file modified
locolander/locolanderweb/tasks.py (+7/-1)
To merge this branch: bzr merge lp:~ricardokirkner/locolander/fix-scan-project
Reviewer Review Type Date Requested Status
Facundo Batista Approve
Review via email: mp+179577@code.launchpad.net

Commit message

pass parameters explicitly to get_or_create

To post a comment you must log in.
Revision history for this message
Facundo Batista (facundo) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'locolander/locolanderweb/tasks.py'
2--- locolander/locolanderweb/tasks.py 2013-07-20 21:07:18 +0000
3+++ locolander/locolanderweb/tasks.py 2013-08-10 16:53:54 +0000
4@@ -1,5 +1,6 @@
5 import os
6 import subprocess
7+from datetime import datetime
8
9 from celery import task
10
11@@ -49,4 +50,9 @@
12 def scan_project(project):
13 mrs = project.service.approved_requests_for_project_url(project.url)
14 for mr in mrs:
15- MergeRequest.objects.get_or_create(project=project, **mr)
16+ # remove tzinfo and cast to UTC because USE_TZ=False
17+ # and sqlite3 doesn't support them
18+ mr['date_created'] = datetime(*mr['date_created'].timetuple()[:-2])
19+ MergeRequest.objects.get_or_create(
20+ project=project, source=mr['source'], target=mr['target'],
21+ date_created=mr['date_created'], defaults=mr)

Subscribers

People subscribed via source and target branches

to all changes: