Merge lp:~jonathanharker/libravatar/devel into lp:~libravatar/libravatar/trunk-old

Proposed by Jonathan Harker
Status: Merged
Merge reported by: François Marier
Merged at revision: not available
Proposed branch: lp:~jonathanharker/libravatar/devel
Merge into: lp:~libravatar/libravatar/trunk-old
Diff against target: 31 lines (+5/-2)
1 file modified
libravatar/settings.py.example (+5/-2)
To merge this branch: bzr merge lp:~jonathanharker/libravatar/devel
Reviewer Review Type Date Requested Status
Libravatar Hackers Pending
Review via email: mp+27428@code.launchpad.net

Description of the change

Made /home/françois go away - and renamed settings.py.example (to be copied and configured)

To post a comment you must log in.
lp:~jonathanharker/libravatar/devel updated
41. By François Marier

Merge Jon's changes to settings.py

https://code.launchpad.net/~jonathanharker/libravatar/devel/+merge/27428

Revision history for this message
François Marier (fmarier) wrote :

Oarsum!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'libravatar/settings.py' => 'libravatar/settings.py.example'
2--- libravatar/settings.py 2010-06-10 03:48:45 +0000
3+++ libravatar/settings.py.example 2010-06-12 15:07:26 +0000
4@@ -3,6 +3,9 @@
5 DEBUG = True
6 TEMPLATE_DEBUG = DEBUG
7
8+import os
9+PROJECT_ROOT = os.path.dirname(os.path.dirname(__file__))
10+
11 ADMINS = (
12 # ('Your Name', 'your_email@domain.com'),
13 )
14@@ -35,7 +38,7 @@
15
16 # Absolute path to the directory that holds media.
17 # Example: "/home/media/media.lawrence.com/"
18-MEDIA_ROOT = '/home/francois/devel/remote/libravatar/'
19+MEDIA_ROOT = '%s/' % PROJECT_ROOT
20
21 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
22 # trailing slash if there is a path component (optional in other cases).
23@@ -69,7 +72,7 @@
24 # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
25 # Always use forward slashes, even on Windows.
26 # Don't forget to use absolute paths, not relative paths.
27- '/home/francois/devel/remote/libravatar/libravatar/templates',
28+ '%s/libravatar/templates' % PROJECT_ROOT,
29 )
30
31 INSTALLED_APPS = (

Subscribers

People subscribed via source and target branches