Merge lp:~cjohnston/loco-team-portal/init-changes-fixes into lp:loco-team-portal

[Chris Johnston]

Moves init-ld to common, renames init-ld to init for easier use between projects, fixes the error where manage.py would tell you that you need to run init even after you ran it.

[Adnane Belmadiaf (daker)]

Good work.

review: Approve

=== modified file 'Makefile'
--- Makefile	2012-05-27 16:22:47 +0000
+++ Makefile	2012-06-30 00:33:19 +0000
@@ -7,7 +7,7 @@
 projectroot=$(shell pwd |sed -e 's/\//\\\//g')
 
 init: env db
-	$(django_manage) init-ld
+	$(django_manage) init
 
 env:
 	virtualenv --clear --no-site-packages --python=/usr/bin/python2.6 env

=== modified file 'TRANSITION.TO.0.2'
--- TRANSITION.TO.0.2	2010-08-20 13:05:47 +0000
+++ TRANSITION.TO.0.2	2012-06-30 00:33:19 +0000
@@ -21,7 +21,7 @@
 4. $ ./manage.py syncdb
 5. $ ./manage.py migrate teams 0001 --fake
 6. $ ./manage.py migrate
-7. Update translations, set up jquery symlinks, etc.: $ ./manage.py init-ld
+7. Update translations, set up jquery symlinks, etc.: $ ./manage.py init
 
 = Enable =
 1. Enable loco-directory service (a2ensite loco.ubuntu.com)

=== renamed file 'loco_directory/teams/management/commands/init-ld.py' => 'loco_directory/common/management/commands/init.py'
=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2012-06-20 10:32:02 +0000
+++ loco_directory/settings.py	2012-06-30 00:33:19 +0000
@@ -10,10 +10,12 @@
     import ubuntu_website
     uw_import = True
 except ImportError:
-    if not 'init-ld' in sys.argv:
-        print "You will need to run  ./manage.py init-ld  to make the LoCo Team Portal fully work."
-    else:
+    try:
+        import bzr_apps
         pass
+    except:
+        if not 'init' in sys.argv:
+            print "You will need to run ./manage.py init to make the LoCo Team Portal fully work."
 
 # Check for necessary modules
 modules = {
@@ -38,8 +40,8 @@
 OPENID_FOLLOW_RENAMES = True
 
 VERSION_STRING = utils.get_locodirectory_version(
-			os.path.join(PROJECT_PATH, "version"),
-			DEBUG)
+            os.path.join(PROJECT_PATH, "version"),
+            DEBUG)
 
 ADMINS = (
     ('somebody', '[e-mail]'),