=== modified file 'lib/lp/answers/doc/person.txt'
--- lib/lp/answers/doc/person.txt	2010-04-20 20:27:09 +0000
+++ lib/lp/answers/doc/person.txt	2010-04-21 16:05:41 +0000
@@ -352,7 +352,7 @@
 
     >>> login('<email address hidden>')
 
-    # A product cannot be deactivated if it is linked to source packages.
+    # Unlink the source packages so the project can be deactivated.
     >>> from lp.testing import unlink_source_packages
     >>> unlink_source_packages(firefox)
     >>> firefox.active = False

=== modified file 'lib/lp/blueprints/doc/specification.txt'
--- lib/lp/blueprints/doc/specification.txt	2010-04-20 20:27:09 +0000
+++ lib/lp/blueprints/doc/specification.txt	2010-04-21 16:05:41 +0000
@@ -208,7 +208,7 @@
     >>> from canonical.database.sqlbase import flush_database_updates
     >>> login('<email address hidden>')
 
-    # A product cannot be deactivated if it is linked to source packages.
+    # Unlink the source packages so the project can be deactivated.
     >>> from lp.testing import unlink_source_packages
     >>> unlink_source_packages(upstream_firefox)
     >>> upstream_firefox.active = False

=== modified file 'lib/lp/blueprints/doc/sprint.txt'
--- lib/lp/blueprints/doc/sprint.txt	2010-04-20 20:27:09 +0000
+++ lib/lp/blueprints/doc/sprint.txt	2010-04-21 16:05:41 +0000
@@ -156,7 +156,7 @@
     >>> firefox = getUtility(IProductSet).getByName('firefox')
     >>> login("<email address hidden>")
 
-    # A product cannot be deactivated if it is linked to source packages.
+    # Unlink the source packages so the project can be deactivated.
     >>> from lp.testing import unlink_source_packages
     >>> unlink_source_packages(firefox)
     >>> firefox.active = False

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2010-04-19 20:03:36 +0000
+++ lib/lp/registry/browser/product.py	2010-04-21 14:34:21 +0000
@@ -1376,7 +1376,7 @@
         return self.next_url
 
 
-class EditPrivateBugsMixin:
+class ProductValidationMixin:
 
     def validate_private_bugs(self, data):
         """Perform validation for the private bugs setting."""
@@ -1387,8 +1387,20 @@
                     'for this project first.',
                     canonical_url(self.context, rootsite="bugs")))
 
-
-class ProductAdminView(ProductEditView, EditPrivateBugsMixin):
+    def validate_deactivation(self, data):
+        """Verify whether a product can be safely deactivated."""
+        if data['active'] == False and self.context.active == True:
+            if len(self.context.sourcepackages) > 0:
+                self.setFieldError('active',
+                    structured(
+                        'This project cannot be deactivated since it is '
+                        'linked to one or more '
+                        '<a href="%s">source packages</a>.',
+                        canonical_url(self.context, view_name='+packages')))
+
+
+class ProductAdminView(ProductEditView, ProductValidationMixin):
+    """View for $project/+admin"""
     label = "Administer project details"
     field_names = ["name", "owner", "active", "autoupdate", "private_bugs"]
 
@@ -1443,15 +1455,7 @@
     def validate(self, data):
         """See `LaunchpadFormView`."""
         self.validate_private_bugs(data)
-
-        if data['active'] == False and self.context.active == True:
-            if len(self.context.sourcepackages) > 0:
-                self.setFieldError('active',
-                    structured(
-                        'This project cannot be deactivated since it is '
-                        'linked to '
-                        '<a href="%s/+packages">source packages</a>.',
-                        canonical_url(self.context)))
+        self.validate_deactivation(data)
 
     @property
     def cancel_url(self):
@@ -1460,7 +1464,7 @@
 
 
 class ProductReviewLicenseView(ReturnToReferrerMixin,
-                               ProductEditView, EditPrivateBugsMixin):
+                               ProductEditView, ProductValidationMixin):
     """A view to review a project and change project privileges."""
     label = "Review project"
     field_names = [
@@ -1499,15 +1503,7 @@
         # Private bugs can only be enabled if the product has a bug
         # supervisor.
         self.validate_private_bugs(data)
-
-        if data['active'] == False and self.context.active == True:
-            if len(self.context.sourcepackages) > 0:
-                self.setFieldError('active',
-                    structured(
-                        'This project cannot be deactivated since it is '
-                        'linked to '
-                        '<a href="%s/+packages">source packages</a>.',
-                        canonical_url(self.context)))
+        self.validate_deactivation(data)
 
 
 class ProductAddSeriesView(LaunchpadFormView):

=== modified file 'lib/lp/registry/doc/milestone.txt'
--- lib/lp/registry/doc/milestone.txt	2010-04-20 20:27:09 +0000
+++ lib/lp/registry/doc/milestone.txt	2010-04-21 16:05:41 +0000
@@ -222,7 +222,7 @@
     >>> print [milestone.name for milestone in gnome.milestones]
     [u'1.1.']
 
-    # A product cannot be deactivated if it is linked to source packages.
+    # Unlink the source packages so the project can be deactivated.
     >>> from lp.testing import unlink_source_packages
     >>> unlink_source_packages(netapplet)
     >>> netapplet.active = False

=== modified file 'lib/lp/registry/doc/person.txt'
--- lib/lp/registry/doc/person.txt	2010-04-20 20:27:09 +0000
+++ lib/lp/registry/doc/person.txt	2010-04-21 16:05:41 +0000
@@ -1348,7 +1348,7 @@
     >>> firefox = getUtility(IProductSet).getByName('firefox')
     >>> login("<email address hidden>")
 
-    # A product cannot be deactivated if it is linked to source packages.
+    # Unlink the source packages so the project can be deactivated.
     >>> from lp.testing import unlink_source_packages
     >>> unlink_source_packages(firefox)
     >>> firefox.active = False

=== modified file 'lib/lp/registry/doc/pillar.txt'
--- lib/lp/registry/doc/pillar.txt	2010-04-20 20:27:09 +0000
+++ lib/lp/registry/doc/pillar.txt	2010-04-21 16:05:41 +0000
@@ -113,7 +113,7 @@
 
 But only if the pillar which they point to is active.
 
-    # A product cannot be deactivated if it is linked to source packages.
+    # Unlink the source packages so the project can be deactivated.
     >>> from lp.testing import unlink_source_packages
     >>> unlink_source_packages(firefox)
     >>> firefox.active = False

=== modified file 'lib/lp/registry/doc/product.txt'
--- lib/lp/registry/doc/product.txt	2010-04-20 20:27:09 +0000
+++ lib/lp/registry/doc/product.txt	2010-04-21 16:05:41 +0000
@@ -91,7 +91,7 @@
 
 Now, to test the active flag. If we disabled a product:
 
-    # A product cannot be deactivated if it is linked to source packages.
+    # Unlink the source packages so the project can be deactivated.
     >>> from lp.testing import unlink_source_packages
     >>> unlink_source_packages(a52dec)
     >>> a52dec.active = False
@@ -196,7 +196,7 @@
 
 Only active products are listed as translatables.
 
-    # A product cannot be deactivated if it is linked to source packages.
+    # Unlink the source packages so the project can be deactivated.
     >>> from lp.testing import unlink_source_packages
     >>> unlink_source_packages(evo)
     >>> evo.active = False

=== modified file 'lib/lp/registry/doc/project.txt'
--- lib/lp/registry/doc/project.txt	2010-04-20 20:27:09 +0000
+++ lib/lp/registry/doc/project.txt	2010-04-21 16:09:32 +0000
@@ -31,7 +31,7 @@
 == Looking up existing projects ==
 
 To fetch a project we use IProjectGroupSet.getByName() or
-IProjectGroupSet.__getitem__. The former will, by default, reeturn active and
+IProjectGroupSet.__getitem__. The former will, by default, return active and
 inactive projects, while the latter returns only active ones. Both can be
 used to look up projects by their aliases, though.
 
@@ -109,7 +109,7 @@
 
     >>> netapplet = gnome.getProduct('netapplet')
 
-    # A product cannot be deactivated if it is linked to source packages.
+    # Unlink the source packages so the project can be deactivated.
     >>> from lp.testing import unlink_source_packages
     >>> unlink_source_packages(netapplet)
     >>> netapplet.active = False
@@ -166,7 +166,7 @@
     >>> from canonical.launchpad.interfaces import IProductSet
     >>> firefox = getUtility(IProductSet).getByName('firefox')
 
-    # A product cannot be deactivated if it is linked to source packages.
+    # Unlink the source packages so the project can be deactivated.
     >>> from lp.testing import unlink_source_packages
     >>> unlink_source_packages(firefox)
     >>> firefox.active = False

=== modified file 'lib/lp/registry/stories/project/xx-project-index.txt'
--- lib/lp/registry/stories/project/xx-project-index.txt	2010-04-20 20:27:09 +0000
+++ lib/lp/registry/stories/project/xx-project-index.txt	2010-04-21 16:05:41 +0000
@@ -151,7 +151,7 @@
     >>> from lp.registry.model.product import Product
     >>> firefox = Product.byName('firefox')
 
-    # A product cannot be deactivated if it is linked to source packages.
+    # Unlink the source packages so the project can be deactivated.
     >>> from lp.testing import unlink_source_packages
     >>> login('<email address hidden>')
     >>> unlink_source_packages(firefox)

=== modified file 'lib/lp/registry/tests/test_product.py'
--- lib/lp/registry/tests/test_product.py	2010-04-19 20:03:36 +0000
+++ lib/lp/registry/tests/test_product.py	2010-04-21 16:15:29 +0000
@@ -19,7 +19,7 @@
 from canonical.launchpad.ftests import syncUpdate
 
 from lp.registry.interfaces.person import IPersonSet
-from lp.registry.interfaces.product import IProductSet, License
+from lp.registry.interfaces.product import License
 from lp.registry.model.product import Product
 from lp.registry.model.productlicense import ProductLicense
 from lp.registry.model.commercialsubscription import (
@@ -35,12 +35,14 @@
         # Ensure that a product cannot be deactivated if
         # it is linked to source packages.
         login('<email address hidden>')
-        firefox = getUtility(IProductSet).getByName('firefox')
-        self.assertEqual(True, firefox.active)
-        self.failUnless(len(firefox.sourcepackages) > 0)
+        product = self.factory.makeProduct()
+        source_package = self.factory.makeSourcePackage()
+        self.assertEqual(True, product.active)
+        source_package.setPackaging(
+            product.development_focus, self.factory.makePerson())
         self.assertRaises(
             AssertionError,
-            setattr, firefox, 'active', False)
+            setattr, product, 'active', False)
 
     def test_deactivation_success(self):
         # Ensure that a product can be deactivated if

=== modified file 'lib/lp/translations/doc/translationimportqueue.txt'
--- lib/lp/translations/doc/translationimportqueue.txt	2010-04-20 20:27:09 +0000
+++ lib/lp/translations/doc/translationimportqueue.txt	2010-04-21 16:05:41 +0000
@@ -1043,7 +1043,7 @@
 An administrator deactivates Firefox, thinking that the project is being
 run in violation of Launchpad policies.
 
-    # A product cannot be deactivated if it is linked to source packages.
+    # Unlink the source packages so the project can be deactivated.
     >>> from lp.testing import unlink_source_packages
     >>> unlink_source_packages(firefox)
     >>> firefox.active = False

=== modified file 'lib/lp/translations/stories/translationgroups/30-show-group-translation-targets.txt'
--- lib/lp/translations/stories/translationgroups/30-show-group-translation-targets.txt	2010-04-20 20:27:09 +0000
+++ lib/lp/translations/stories/translationgroups/30-show-group-translation-targets.txt	2010-04-21 16:05:41 +0000
@@ -26,7 +26,7 @@
     >>> admin_browser.url
     'http://launchpad.dev/projectgroups'
 
-    # A product cannot be deactivated if it is linked to source packages.
+    # Unlink the source packages so the project can be deactivated.
     >>> from lp.testing import unlink_source_packages
     >>> from lp.registry.interfaces.product import IProductSet
     >>> from zope.component import getUtility