Merge lp:~rvb/maas/fix-region-admin-cli into lp:~maas-maintainers/maas/packaging

[Raphaël Badin]

Rewrite debian/extras/maas-region-admin so that it doesn't use django-admin which prints garbage to stdout.

[Graham Binns (gmb)]

review: Approve

[MAAS Lander (maas-lander)]

Attempt to merge into lp:~maas-maintainers/maas/packaging failed due to conflicts:

text conflict in debian/changelog

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-09 21:08:50 +0000
+++ debian/changelog	2014-09-10 07:55:12 +0000
@@ -23,6 +23,10 @@
   * debian/maas-region-controller-min.install: Install
     maas-generate-winrm-cert script.
 
+  [ Raphaël Badin ]
+  * debian/extras/maas-region-admin: Bypass django-admin as it prints
+    spurious messages to stdout (LP: #1365130).
+
  -- Andres Rodriguez <[e-mail]>  Thu, 21 Aug 2014 19:36:30 -0400
 
 maas (1.7.0~beta1+bzr2781-0ubuntu1) utopic; urgency=medium

=== modified file 'debian/extras/maas-region-admin'
--- debian/extras/maas-region-admin	2014-02-12 05:46:08 +0000
+++ debian/extras/maas-region-admin	2014-09-10 07:55:12 +0000
@@ -1,8 +1,16 @@
-#!/bin/sh
-if [ "$(id -u)" != "0" ]; then
-	echo "This utility may only be run as root." 1>&2
-	exit 1
-fi
-export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}"
-export DJANGO_SETTINGS_MODULE="maas.settings"
-exec /usr/bin/django-admin "$@"
+#!/usr/bin/python
+import os
+import sys
+
+user_id = os.getuid()
+if user_id != 0:
+    print("This utility may only be run as root.")
+    sys.exit(1)
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.settings")
+sys.path.append('/usr/share/maas')
+
+from django.core import management
+
+if __name__ == "__main__":
+    management.execute_from_command_line()