launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

Andres Rodriguez has proposed merging lp:~andreserl/maas/bzr1527_release into lp:~maas-maintainers/maas/packaging.

Commit message:
Releasing 1.4+bzr1527+dfsg-0ubuntu1
Opening 1.4+bzr1527+dfsg-0ubuntu2

Requested reviews:
  Andres Rodriguez (andreserl)
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/bzr1527_release/+merge/169316
-- 
https://code.launchpad.net/~andreserl/maas/bzr1527_release/+merge/169316
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/bzr1527_release into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-04 15:14:34 +0000
+++ debian/changelog	2013-06-14 00:13:54 +0000
@@ -1,7 +1,15 @@
-maas (1.4+bzr1510+dfsg-0ubuntu2) UNRELEASED; urgency=low
+maas (1.4+bzr1527+dfsg-0ubuntu2) UNRELEASED; urgency=low
 
   * UNRELEASED
 
+ -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Thu, 13 Jun 2013 20:06:35 -0400
+
+maas (1.4+bzr1527+dfsg-0ubuntu1) saucy; urgency=low
+
+  * debian/patches/04-setup-dont-user-list-snippets.patch: Drop importing
+    maasserver modules to list snippets in favor to using glob. Otherwise
+    we would have to add various non necessary Build-Dependencies.
+
   [ Jeroen Vermeulen ]
   * Install templates into /etc/maas/templates/.
 

=== added file 'debian/patches/04-setup-dont-user-list-snippets.patch'
--- debian/patches/04-setup-dont-user-list-snippets.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/04-setup-dont-user-list-snippets.patch	2013-06-14 00:13:54 +0000
@@ -0,0 +1,34 @@
+Index: maas-1.4+bzr1527+dfsg.orig/setup.py
+===================================================================
+--- maas-1.4+bzr1527+dfsg.orig.orig/setup.py	2013-06-13 19:18:36.000000000 -0400
++++ maas-1.4+bzr1527+dfsg.orig/setup.py	2013-06-13 19:20:14.824838450 -0400
+@@ -29,20 +29,6 @@
+ sys.path.append(join(SOURCE_DIR, 'src'))
+ 
+ 
+-def list_commissioning_snippets():
+-    """List the commissioning snippet files."""
+-    # Lazy import.  Won't work until MAAS has been added to the import path.
+-    from metadataserver.commissioning.snippets import list_snippets
+-
+-    snippets_dir = 'etc/maas/templates/commissioning-user-data/snippets'
+-    # The list_snippets helper knows which files look like snippets and which
+-    # files should be ignored.
+-    return [
+-        join(snippets_dir, snippet)
+-        for snippet in list_snippets(join(SOURCE_DIR, snippets_dir))
+-        ]
+-
+-
+ def read(filename):
+     """Return the whitespace-stripped content of `filename`."""
+     path = join(SOURCE_DIR, filename)
+@@ -97,7 +83,7 @@
+         ('/etc/maas/templates/commissioning-user-data',
+             glob('etc/maas/templates/commissioning-user-data/*.template')),
+         ('/etc/maas/templates/commissioning-user-data/snippets',
+-            list_commissioning_snippets()),
++            glob('etc/maas/templates/commissioning-user-data/snippets/*.py')),
+         ('/usr/share/maas',
+             ['contrib/wsgi.py',
+              'etc/celeryconfig.py',

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-10-11 14:32:10 +0000
+++ debian/patches/series	2013-06-14 00:13:54 +0000
@@ -1,3 +1,4 @@
 01-fix-database-settings.patch
 02-pserv-config.patch
 03-txlongpoll-config.patch
+04-setup-dont-user-list-snippets.patch