Merge lp:~mindlace/postorius/standalone_use_wd_db into lp:~mailman-coders/postorius/postorius_standalone

Proposed by Ethan Fremen
Status: Merged
Merged at revision: 2
Proposed branch: lp:~mindlace/postorius/standalone_use_wd_db
Merge into: lp:~mailman-coders/postorius/postorius_standalone
Diff against target: 17 lines (+2/-1)
2 files modified
.bzrignore (+1/-0)
settings.py (+1/-1)
To merge this branch: bzr merge lp:~mindlace/postorius/standalone_use_wd_db
Reviewer Review Type Date Requested Status
Florian Fuchs Approve
Review via email: mp+122866@code.launchpad.net

Description of the change

Make settings.py use PROJECT_PATH for location of db.
Change .bzrignore to ignore the db.

To post a comment you must log in.
3. By Ethan Fremen

use os.path.join for db location.

Revision history for this message
Florian Fuchs (flo-fuchs) wrote :

Hi Ethan,

thanks very much for the fix! I have just merged it into the standalone branch...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '.bzrignore'
2--- .bzrignore 1970-01-01 00:00:00 +0000
3+++ .bzrignore 2012-09-05 16:24:21 +0000
4@@ -0,0 +1,1 @@
5+postorius.db
6
7=== modified file 'settings.py'
8--- settings.py 2012-07-16 20:26:43 +0000
9+++ settings.py 2012-09-05 16:24:21 +0000
10@@ -45,7 +45,7 @@
11 DATABASES = {
12 'default': {
13 'ENGINE': 'django.db.backends.sqlite3',
14- 'NAME': '/path/to/postorius_standalone/postorius.db'
15+ 'NAME': os.path.join(PROJECT_PATH,'postorius.db')
16 }
17 }
18

Subscribers

People subscribed via source and target branches