Andres Rodriguez has proposed merging lp:~andreserl/maas/new_packaging into lp:~maas-maintainers/maas/packaging.
Commit message: Drop 04-setup-dont-user-list-snippets.patch as this fix has been merged upstream Requested reviews: Andres Rodriguez (andreserl) Launchpad code reviewers (launchpad-reviewers) For more details, see: https://code.launchpad.net/~andreserl/maas/new_packaging/+merge/169329 -- https://code.launchpad.net/~andreserl/maas/new_packaging/+merge/169329 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/new_packaging into lp:~maas-maintainers/maas/packaging.
=== modified file 'debian/changelog' --- debian/changelog 2013-06-14 00:07:10 +0000 +++ debian/changelog 2013-06-14 02:56:27 +0000 @@ -1,6 +1,8 @@ -maas (1.4+bzr1527+dfsg-0ubuntu2) UNRELEASED; urgency=low +maas (1.4+bzr1528+dfsg-0ubuntu1) UNRELEASED; urgency=low - * UNRELEASED + * New upstream release + * debian/patches/04-setup-dont-user-list-snippets.patch: Drop. Merged + Upstream. -- Andres Rodriguez <[email protected]> Thu, 13 Jun 2013 20:06:35 -0400 === removed file 'debian/patches/04-setup-dont-user-list-snippets.patch' --- debian/patches/04-setup-dont-user-list-snippets.patch 2013-06-14 00:06:29 +0000 +++ debian/patches/04-setup-dont-user-list-snippets.patch 1970-01-01 00:00:00 +0000 @@ -1,34 +0,0 @@ -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 2013-06-14 00:06:29 +0000 +++ debian/patches/series 2013-06-14 02:56:27 +0000 @@ -1,4 +1,3 @@ 01-fix-database-settings.patch 02-pserv-config.patch 03-txlongpoll-config.patch -04-setup-dont-user-list-snippets.patch
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
