Merge lp:~al-maisan/launchpad/subsets into lp:launchpad/db-devel

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Hello there!

The branch at hand fixes bug #472326. When a package set P is to add/remove
another package (sub-)set Q then both P and Q must be related to the same
distro series.

The bug was discovered during testing on Soyuz dogfood and is
release-critical.

Tests to run:

    bin/test -vv -t packageset.txt

[Graham Binns (gmb)]

review: Approve

[Michael Nelson (michael.nelson)]

review: Approve (release-critical)

=== modified file 'lib/lp/soyuz/model/packageset.py'
--- lib/lp/soyuz/model/packageset.py	2009-10-30 20:28:16 +0000
+++ lib/lp/soyuz/model/packageset.py	2009-11-03 08:55:24 +0000
@@ -288,12 +288,16 @@
 
     def addSubsets(self, names):
         """See `IPackageset`."""
-        clauses = (Packageset, In(Packageset.name, names))
+        clauses = (
+            Packageset, In(Packageset.name, names),
+            Packageset.distroseries == self.distroseries)
         self._api_add_or_remove(clauses, self._addDirectSuccessors)
 
     def removeSubsets(self, names):
         """See `IPackageset`."""
-        clauses = (Packageset, In(Packageset.name, names))
+        clauses = (
+            Packageset, In(Packageset.name, names),
+            Packageset.distroseries == self.distroseries)
         self._api_add_or_remove(clauses, self._removeDirectSuccessors)
 
     def relatedSets(self):

=== modified file 'lib/lp/soyuz/stories/webservice/xx-packageset.txt'
--- lib/lp/soyuz/stories/webservice/xx-packageset.txt	2009-11-02 11:50:24 +0000
+++ lib/lp/soyuz/stories/webservice/xx-packageset.txt	2009-11-03 08:55:24 +0000
@@ -18,6 +18,9 @@
 Please refer to the tests contained in the file above if you are really
 interested in package sets and the complete functionality they offer.
 
+
+== General package set properties ==
+
 We start off by creating an 'umbrella' package set that will include all
 source packages.
 
@@ -214,6 +217,50 @@
     HTTP/1.1 201 Created
     ...
 
+
+=== Package sets and distro series ===
+
+Every package set is associated with a distro series.
+
+    >>> from lazr.restful.testing.webservice import pprint_entry
+    >>> mozilla = webservice.named_get(
+    ...     '/package-sets', 'getByName', {}, name=u'mozilla').jsonBody()
+    >>> print mozilla['distroseries_link']
+    http://api.launchpad.dev/beta/ubuntu/hoary
+
+
+=== Related package sets ===
+
+When adding a package set we can specify that is to be related to another set
+that exists already.
+
+    >>> grumpy = webservice.get("/ubuntu/grumpy").jsonBody()
+    >>> print grumpy['self_link']
+    http://api.launchpad.dev/beta/ubuntu/grumpy
+
+We are adding a new 'mozilla' package set to the 'grumpy' distro series and
+it is related to 'mozilla' in 'hoary'.
+
+    >>> response = webservice.named_post(
+    ...     '/package-sets', 'new', {},
+    ...     name=u'mozilla',
+    ...     description=u'Contains all mozilla packages in grumpy',
+    ...     owner=name12['self_link'], distroseries=grumpy['self_link'],
+    ...     related_set=mozilla['self_link'])
+    >>> print response
+    HTTP/1.1 201 Created
+    ...
+
+    >>> response = webservice.named_get(
+    ...     mozilla['self_link'], 'relatedSets', {})
+    >>> print_payload(response)
+    http://api.launchpad.dev/beta/package-sets/grumpy/mozilla
+
+
+== Package set hierarchy ==
+
+More package sets are needed to set up the hierarchy described below.
+
     >>> response = webservice.named_post(
     ...     '/package-sets', 'new', {},
     ...     name=u'firefox', description=u'Contains all firefox packages',
@@ -240,6 +287,18 @@
     HTTP/1.1 201 Created
     ...
 
+The 'languagepack' package set will be removed later (in hoary). Let's add a
+set with the same name in 'grumpy' to make sure that the right one is found.
+
+    >>> response = webservice.named_post(
+    ...     '/package-sets', 'new', {},
+    ...     name=u'languagepack',
+    ...     description=u'Contains all languagepack packages',
+    ...     owner=name12['self_link'], distroseries=grumpy['self_link'])
+    >>> print response
+    HTTP/1.1 201 Created
+    ...
+
 In order to test whether methods relating to package set hierarchies were
 exposed on the Launchpad API correctly we will define the following package
 set hierarchy:
@@ -451,39 +510,6 @@
     ["cnews", "thunderbird"]
 
 
-=== Package sets and distro series ===
-
-Every package set is associated with a distro series.
-
-    >>> from lazr.restful.testing.webservice import pprint_entry
-    >>> mozilla = webservice.named_get(
-    ...     '/package-sets', 'getByName', {}, name=u'mozilla').jsonBody()
-    >>> print mozilla['distroseries_link']
-    http://api.launchpad.dev/beta/ubuntu/hoary
-
-
-=== Related package sets ===
-
-When adding a package set we can specify that is to be related to another set
-that exists already.
-
-    >>> grumpy = webservice.get("/ubuntu/grumpy").jsonBody()
-    >>> print grumpy['self_link']
-    http://api.launchpad.dev/beta/ubuntu/grumpy
-
-We are adding a new 'mozilla' package set to the 'grumpy' distro series and
-it is related to 'mozilla' in 'hoary'.
-
-    >>> response = webservice.named_post(
-    ...     '/package-sets', 'new', {},
-    ...     name=u'mozilla',
-    ...     description=u'Contains all mozilla packages',
-    ...     owner=name12['self_link'], distroseries=grumpy['self_link'],
-    ...     related_set=mozilla['self_link'])
-    >>> print response
-    HTTP/1.1 201 Created
-    ...
-
 == Archive permissions and package sets ==
 
 Operating on package set based archive permissions is possible via