launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

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

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

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

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-08 21:03:50 +0000
+++ debian/changelog	2012-10-09 16:23:20 +0000
@@ -1,6 +1,8 @@
-maas (0.1+bzr1226+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr1239+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
-  * UNRELEASED
+  * New upstream release.
+  * debian/patches/99-temporary-fix-constraints.patch: Dropped.
+  * debian/control: ${python:Depends} for maas-common.
 
  -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Mon, 08 Oct 2012 17:02:56 -0400
 

=== modified file 'debian/control'
--- debian/control	2012-10-08 05:07:49 +0000
+++ debian/control	2012-10-09 16:23:20 +0000
@@ -33,6 +33,7 @@
 
 Package: maas-common
 Architecture: all
+Depends: ${python:Depends}
 Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Description: Ubuntu MAAS Server

=== removed file 'debian/patches/99-temporary-fix-constraints.patch'
--- debian/patches/99-temporary-fix-constraints.patch	2012-10-08 20:45:01 +0000
+++ debian/patches/99-temporary-fix-constraints.patch	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-Index: maas-0.1+bzr1223+dfsg.orig/src/maasserver/api.py
-===================================================================
---- maas-0.1+bzr1223+dfsg.orig.orig/src/maasserver/api.py	2012-10-08 13:45:42.932085138 -0400
-+++ maas-0.1+bzr1223+dfsg.orig/src/maasserver/api.py	2012-10-08 14:47:34.372180169 -0400
-@@ -691,6 +691,14 @@
-     'mem': 'memory',
-     }
- 
-+# Map the arch constraint as passed in the request to the name of the
-+# arch/subarch in the database.
-+_constraints_arch_map = {
-+    'i386': 'i386/generic',
-+    'amd64': 'amd64/generic',
-+    'armhf': 'armhf/highbank',
-+    }
-+
- 
- def extract_constraints(request_params):
-     """Extract a dict of node allocation constraints from http parameters.
-@@ -704,7 +712,10 @@
-     for request_name in _constraints_map:
-         if request_name in request_params:
-             db_name = _constraints_map[request_name]
--            constraints[db_name] = request_params[request_name]
-+            if request_params[request_name] in _constraints_arch_map:
-+                constraints[db_name] = _constraints_arch_map[request_params[request_name]]
-+            else:
-+                constraints[db_name] = request_params[request_name]
-     return constraints
- 
- 

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-10-08 20:45:01 +0000
+++ debian/patches/series	2012-10-09 16:23:20 +0000
@@ -1,4 +1,3 @@
 01-fix-database-settings.patch
 02-pserv-config.patch
 03-txlongpoll-config.patch
-99-temporary-fix-constraints.patch