Merge lp:~stevenk/launchpad/bugs-remove-old-privacy into lp:launchpad

[Steve Kowalik]

Replace private and security_related in CreateBugParams() with information_type, and replace IBug.setPrivacyAndSecurityRelated() with IBug.transistionToInformationType().

As part of the slow march towards un-conflating privacy and security of bugs, we are moving everything from using Bug.private and Bug.security_related to Bug.information_type.

This branch moves the code from IBug.setPrivacyAndSecurityRelated() to a new function, IBug.transistionToInformationType(), which is exported over the devel API. This slightly changes the behavior of the function, since it will now always complain about multi-pillar private bugs whereas it used to only care if you were flipping the privacy flag.

I have dropped private and security from CreateBugParams and replaced it with information_type. I have hacked around that in the factory and a few other places to make this branch a little more manageable.

I think this branch is safe to land in its current state, with or without the DB patches -11-4 and -12-3 applied.

[Ian Booth (wallyworld)]

This looks good. As discussed, setPrivacyAndSecurityRelated could be changed to no longer return a tuple.
I am scared there's stuff we haven't anticipated that could break, but that's what our marvellous tests are for, right?

review: Approve

[Ian Booth (wallyworld)]

I would actually remove setPrivacyAndSecurityRelated entirely.
It is a recent addition can can be removed from the API since AFAIUI was only exported to 'devel' and never formally released.

[William Grant (wgrant)]

lib/lp/bugs/mail/commands.py seems to have inverted logic. The second branch is executed if it's *not* embargoedsecurity. Apart from that I can't see any more glaring issues.

=== modified file 'lib/lp/bugs/browser/bug.py'
--- lib/lp/bugs/browser/bug.py	2012-03-13 00:45:33 +0000
+++ lib/lp/bugs/browser/bug.py	2012-03-29 05:56:22 +0000
@@ -69,6 +69,7 @@
 from lp.app.errors import NotFoundError
 from lp.app.widgets.itemswidgets import LaunchpadRadioWidgetWithDescription
 from lp.app.widgets.project import ProjectScopeWidget
+from lp.bugs.adapters.bug import convert_to_information_type
 from lp.bugs.browser.bugsubscription import BugPortletSubscribersWithDetails
 from lp.bugs.browser.widgets.bug import BugTagsWidget
 from lp.bugs.enums import BugNotificationLevel
@@ -874,7 +875,7 @@
 
         # We handle privacy changes by hand instead of leaving it to
         # the usual machinery because we must use
-        # bug.setPrivacyAndSecurityRelated() to ensure auditing information is
+        # bug.transitionToInformationType() to ensure auditing information is
         # recorded.
         bug = self.context.bug
         private = data.pop('private', bug.private)
@@ -882,12 +883,14 @@
             private and bug.getSubscribersForPerson(self.user).is_empty())
         security_related = data.pop('security_related')
         user = getUtility(ILaunchBag).user
-        (private_changed, security_related_changed) = (
-            bug.setPrivacyAndSecurityRelated(private, security_related, user))
-        if private_changed:
+        # This will change when the UI does.
+        information_type = convert_to_information_type(
+            private, security_related)
+        changed = bug.transitionToInformationType(information_type, user)
+        if changed:
             self._handlePrivacyChanged(user_will_be_subscribed)
         if self.request.is_ajax:
-            if private_changed or security_related_changed:
+            if changed:
                 return self._getSubscriptionDetails()
             else:
                 return ''

=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py	2012-02-21 22:46:28 +0000
+++ lib/lp/bugs/browser/bugtarget.py	2012-03-29 05:56:22 +0000
@@ -117,6 +117,7 @@
     ProductConfigureBase,
     ProductPrivateBugsMixin,
     )
+from lp.registry.enums import InformationType
 from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.distributionsourcepackage import (
     IDistributionSourcePackage,
@@ -580,12 +581,13 @@
         if self.request.form.get("packagename_option") == "none":
             packagename = None
 
-        # Security bugs are always private when filed, but can be disclosed
+        # Security bugs are always embargoed when filed, but can be disclosed
         # after they've been reported.
+        # This will change when the UI does.
         if security_related:
-            private = True
+            information_type = InformationType.EMBARGOEDSECURITY
         else:
-            private = False
+            information_type = InformationType.PUBLIC
 
         linkified_ack = structured(FormattersAPI(
             self.getAcknowledgementMessage(self.context)).text_to_html(
@@ -593,7 +595,7 @@
         notifications = [linkified_ack]
         params = CreateBugParams(
             title=title, comment=comment, owner=self.user,
-            security_related=security_related, private=private,
+            information_type=information_type,
             tags=data.get('tags'))
         if IDistribution.providedBy(context) and packagename:
             # We don't know if the package name we got was a source or binary
@@ -623,7 +625,8 @@
                 'Additional information was added to the bug description.')
 
         if extra_data.private:
-            params.private = extra_data.private
+            if params.information_type == InformationType.PUBLIC:
+                params.information_type = InformationType.USERDATA
 
         # Apply any extra options given by privileged users.
         if BugTask.userHasBugSupervisorPrivilegesContext(context, self.user):

=== modified file 'lib/lp/bugs/doc/bug-private-by-default.txt'
--- lib/lp/bugs/doc/bug-private-by-default.txt	2012-01-24 12:36:15 +0000
+++ lib/lp/bugs/doc/bug-private-by-default.txt	2012-03-29 05:56:22 +0000
@@ -5,6 +5,7 @@
 (this is enforced by a DB constraint).
 
     >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.registry.enums import InformationType
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.interfaces.product import IProductSet
     >>> from lp.testing.dbuser import switch_dbuser
@@ -46,7 +47,7 @@
     >>> security_bug_params = CreateBugParams(
     ...     owner=no_priv, title='Security bug',
     ...     comment='A monkey took my GPG keys.',
-    ...     security_related=True)
+    ...     information_type=InformationType.EMBARGOEDSECURITY)
     >>> security_bug = landscape.createBug(security_bug_params)
     >>> [security_bug_task] = security_bug.bugtasks
     >>> security_bug_task.bug.private

=== modified file 'lib/lp/bugs/doc/bug.txt'
--- lib/lp/bugs/doc/bug.txt	2011-12-30 06:14:56 +0000
+++ lib/lp/bugs/doc/bug.txt	2012-03-29 05:56:22 +0000
@@ -90,6 +90,7 @@
 The event can be seen when we file a bug.
 
     >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.registry.enums import InformationType
 
     >>> steve_harris = factory.makePerson(name='steve-harris')
     >>> params = CreateBugParams(
@@ -477,7 +478,7 @@
 
     >>> params = CreateBugParams(
     ...     title="test firefox bug", comment="blah blah blah", owner=foobar,
-    ...     private=True)
+    ...     information_type=InformationType.USERDATA)
     >>> params.setBugTarget(product=firefox)
     >>> added_bug = getUtility(IBugSet).createBug(params)
     >>> private_bug = bugset.get(added_bug.id)
@@ -507,7 +508,7 @@
     >>> evolution = spnset.get(9)
     >>> params = CreateBugParams(
     ...     title="test firefox bug", comment="blah blah blah",
-    ...     owner=foobar, private=True)
+    ...     owner=foobar, information_type=InformationType.USERDATA)
     >>> params.setBugTarget(distribution=ubuntu, sourcepackagename=evolution)
     >>> added_bug = getUtility(IBugSet).createBug(params)
     >>> private_bug = bugset.get(added_bug.id)
@@ -824,6 +825,7 @@
 
 We need a feature flag for this test since multi-pillar bugs shouldn't be
 private by default.
+
     >>> from lp.services.features.testing import FeatureFixture
     >>> feature_flag = {
     ...     'disclosure.allow_multipillar_private_bugs.enabled': 'on'}
@@ -850,6 +852,7 @@
 
 Changing bug security.
 
+    >>> ign = firefox_bug.setPrivate(False, getUtility(ILaunchBag).user)
     >>> bug_before_modification = Snapshot(firefox_bug, providing=IBug)
 
     >>> firefox_bug.security_related

=== modified file 'lib/lp/bugs/doc/bugnotification-sending.txt'
--- lib/lp/bugs/doc/bugnotification-sending.txt	2012-03-13 00:45:33 +0000
+++ lib/lp/bugs/doc/bugnotification-sending.txt	2012-03-29 05:56:22 +0000
@@ -352,6 +352,7 @@
 We will need a fresh new bug.
 
     >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.registry.enums import InformationType
     >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
     >>> description = getUtility(IMessageSet).fromText(
@@ -418,7 +419,7 @@
     ...     sec_vuln_bug = ubuntu.createBug(CreateBugParams(
     ...         msg=sec_vuln_description, owner=sample_person,
     ...         title='Zero-day on Frobulator',
-    ...         security_related=True, private=True))
+    ...         information_type=InformationType.EMBARGOEDSECURITY))
 
     >>> sec_vuln_bug.security_related
     True

=== modified file 'lib/lp/bugs/doc/bugsubscription.txt'
--- lib/lp/bugs/doc/bugsubscription.txt	2012-03-13 00:45:33 +0000
+++ lib/lp/bugs/doc/bugsubscription.txt	2012-03-29 05:56:22 +0000
@@ -48,6 +48,7 @@
 
     >>> from lp.services.webapp.interfaces import ILaunchBag
     >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.registry.enums import InformationType
     >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> ubuntu = getUtility(IDistributionSet).getByName("ubuntu")
@@ -717,7 +718,7 @@
 
     >>> params = CreateBugParams(
     ...     title="a test bug", comment="a test description",
-    ...     owner=foobar, security_related=True, private=True)
+    ...     owner=foobar, information_type=InformationType.EMBARGOEDSECURITY)
     >>> new_bug = ubuntu.createBug(params)
 
     >>> getSubscribers(new_bug)
@@ -805,7 +806,7 @@
 
     >>> params = CreateBugParams(
     ...     title="a test bug", comment="a test description",
-    ...     owner=foobar, security_related=True, private=True)
+    ...     owner=foobar, information_type=InformationType.EMBARGOEDSECURITY)
     >>> new_bug = firefox.createBug(params)
 
     >>> getSubscribers(new_bug)
@@ -871,7 +872,7 @@
     >>> params = CreateBugParams(
     ...     title="yet another test bug",
     ...     comment="yet another test description",
-    ...     owner=foobar, security_related=True, private=True)
+    ...     owner=foobar, information_type=InformationType.EMBARGOEDSECURITY)
     >>> new_bug = evolution.createBug(params)
 
     >>> getSubscribers(new_bug)

=== modified file 'lib/lp/bugs/doc/security-teams.txt'
--- lib/lp/bugs/doc/security-teams.txt	2011-12-24 17:49:30 +0000
+++ lib/lp/bugs/doc/security-teams.txt	2012-03-29 05:56:22 +0000
@@ -37,19 +37,20 @@
     >>> print firefox.security_contact.name
     ubuntu-team
 
-When creating a bug, use the security_related flag to indicate that the
+When creating a bug, use the information_type enum to indicate that the
 bug is a security vulnerability, and the security contact should be
 subscribed to the bug, even when it's marked private.
 
     >>> from lp.services.webapp.interfaces import ILaunchBag
     >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.registry.enums import InformationType
 
     >>> ubuntu_firefox = ubuntu.getSourcePackage("mozilla-firefox")
     >>> params = CreateBugParams(
     ...     owner=getUtility(ILaunchBag).user,
     ...     title="a security bug",
     ...     comment="this is an example security bug",
-    ...     security_related=True, private=True)
+    ...     information_type=InformationType.EMBARGOEDSECURITY)
     >>> bug = ubuntu.createBug(params)
 
     >>> bug.security_related
@@ -79,7 +80,7 @@
     ...     owner=getUtility(ILaunchBag).user,
     ...     title="a security bug",
     ...     comment="this is an example security bug",
-    ...     security_related=False)
+    ...     information_type=InformationType.PUBLIC)
     >>> bug = ubuntu.createBug(params)
 
     >>> bug.security_related
@@ -95,7 +96,7 @@
     ...     owner=getUtility(ILaunchBag).user,
     ...     title="another security bug",
     ...     comment="this is another security bug",
-    ...     security_related=True, private=True)
+    ...     information_type=InformationType.EMBARGOEDSECURITY)
     >>> bug = firefox.createBug(params)
 
     >>> bug.security_related
@@ -113,7 +114,7 @@
     ...     owner=getUtility(ILaunchBag).user,
     ...     title="another security bug",
     ...     comment="this is another security bug",
-    ...     security_related=False)
+    ...     information_type=InformationType.PUBLIC)
     >>> bug = firefox.createBug(params)
 
     >>> bug.security_related
@@ -134,7 +135,7 @@
     ...     owner=getUtility(ILaunchBag).user,
     ...     title="another security bug",
     ...     comment="this is another security bug",
-    ...     security_related=True, private=True)
+    ...     information_type=InformationType.EMBARGOEDSECURITY)
 
     >>> bug = firefox.createBug(params)
 
@@ -190,7 +191,7 @@
     ...     owner=getUtility(ILaunchBag).user,
     ...     title="another security bug",
     ...     comment="this is private security bug",
-    ...     private=True, security_related=True)
+    ...     information_type=InformationType.EMBARGOEDSECURITY)
     >>> bug = firefox.createBug(params)
 
     >>> bug.security_related

=== modified file 'lib/lp/bugs/interfaces/bug.py'
--- lib/lp/bugs/interfaces/bug.py	2012-03-21 01:17:50 +0000
+++ lib/lp/bugs/interfaces/bug.py	2012-03-29 05:56:22 +0000
@@ -100,9 +100,9 @@
 class CreateBugParams:
     """The parameters used to create a bug."""
 
-    def __init__(self, owner, title, comment=None, description=None, msg=None,
-                 status=None, datecreated=None, security_related=False,
-                 private=False, subscribers=(),
+    def __init__(self, owner, title, comment=None, description=None,
+                 msg=None, status=None, datecreated=None,
+                 information_type=InformationType.PUBLIC, subscribers=(),
                  tags=None, subscribe_owner=True, filed_by=None,
                  importance=None, milestone=None, assignee=None, cve=None):
         self.owner = owner
@@ -112,8 +112,7 @@
         self.msg = msg
         self.status = status
         self.datecreated = datecreated
-        self.security_related = security_related
-        self.private = private
+        self.information_type = information_type
         self.subscribers = subscribers
         self.product = None
         self.distribution = None
@@ -891,20 +890,16 @@
         """
 
     @operation_parameters(
-        private=copy_field(IBugPublic['private']),
-        security_related=copy_field(IBugView['security_related']),
+        information_type=copy_field(IBugPublic['information_type']),
         )
     @call_with(who=REQUEST_USER)
     @export_write_operation()
     @operation_for_version("devel")
-    def setPrivacyAndSecurityRelated(private, security_related, who):
-        """Set bug privacy and security .
-
-            :private: True/False.
-            :security_related: True/False.
-            :who: The IPerson who is making the change.
-
-        Return (private_changed, security_related_changed) tuple.
+    def transitionToInformationType(information_type, who):
+        """Set the information type for this bug.
+
+        :information_type: The `InformationType` to transition to.
+        :who: The `IPerson` who is making the change.
         """
 
     @operation_parameters(

=== modified file 'lib/lp/bugs/mail/commands.py'
--- lib/lp/bugs/mail/commands.py	2012-01-01 02:58:52 +0000
+++ lib/lp/bugs/mail/commands.py	2012-03-29 05:56:22 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -46,6 +46,7 @@
     IllegalTarget,
     )
 from lp.bugs.interfaces.cve import ICveSet
+from lp.registry.enums import InformationType
 from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.distributionsourcepackage import (
     IDistributionSourcePackage,
@@ -184,10 +185,13 @@
                 stop_processing=True)
 
         if isinstance(context, CreateBugParams):
-            if context.security_related:
-                # BugSet.createBug() requires new security bugs to be private.
-                private = True
-            context.private = private
+            if private and (
+                context.information_type == InformationType.PUBLIC):
+                context.information_type = InformationType.USERDATA
+            elif (
+                context.information_type !=
+                InformationType.EMBARGOEDSECURITY):
+                context.information_type = InformationType.PUBLIC
             return context, current_event
 
         # Snapshot.
@@ -240,10 +244,8 @@
                 stop_processing=True)
 
         if isinstance(context, CreateBugParams):
-            context.security_related = security_related
             if security_related:
-                # BugSet.createBug() requires new security bugs to be private.
-                context.private = True
+                context.information_type = InformationType.EMBARGOEDSECURITY
             return context, current_event
 
         # Take a snapshot.

=== modified file 'lib/lp/bugs/mail/tests/test_commands.py'
--- lib/lp/bugs/mail/tests/test_commands.py	2012-01-01 02:58:52 +0000
+++ lib/lp/bugs/mail/tests/test_commands.py	2012-03-29 05:56:22 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 from lazr.lifecycle.interfaces import (
@@ -19,6 +19,7 @@
     TagEmailCommand,
     UnsubscribeEmailCommand,
     )
+from lp.registry.enums import InformationType
 from lp.services.mail.interfaces import (
     BugTargetNotFound,
     EmailProcessingError,
@@ -364,7 +365,8 @@
         dummy_event = object()
         params, event = command.execute(bug_params, dummy_event)
         self.assertEqual(bug_params, params)
-        self.assertEqual(True, bug_params.private)
+        self.assertEqual(
+            InformationType.USERDATA, bug_params.information_type)
         self.assertEqual(dummy_event, event)
 
     def test_execute_bug_params_with_security(self):
@@ -372,12 +374,14 @@
         user = self.factory.makePerson()
         login_person(user)
         bug_params = CreateBugParams(
-            title='bug title', owner=user, security_related='yes')
+            title='bug title', owner=user,
+            information_type=InformationType.EMBARGOEDSECURITY)
         command = PrivateEmailCommand('private', ['no'])
         dummy_event = object()
         params, event = command.execute(bug_params, dummy_event)
         self.assertEqual(bug_params, params)
-        self.assertEqual(True, bug_params.private)
+        self.assertEqual(
+            InformationType.EMBARGOEDSECURITY, bug_params.information_type)
         self.assertEqual(dummy_event, event)
 
 
@@ -402,8 +406,8 @@
         dummy_event = object()
         params, event = command.execute(bug_params, dummy_event)
         self.assertEqual(bug_params, params)
-        self.assertEqual(True, bug_params.security_related)
-        self.assertEqual(True, bug_params.private)
+        self.assertEqual(
+            InformationType.EMBARGOEDSECURITY, bug_params.information_type)
         self.assertEqual(dummy_event, event)
 
 

=== modified file 'lib/lp/bugs/model/bug.py'
--- lib/lp/bugs/model/bug.py	2012-03-26 14:23:39 +0000
+++ lib/lp/bugs/model/bug.py	2012-03-29 05:56:22 +0000
@@ -235,11 +235,10 @@
     return Snapshot(
         bug_params, names=[
             "owner", "title", "comment", "description", "msg",
-            "datecreated", "security_related", "private",
-            "distribution", "sourcepackagename",
-            "product", "status", "subscribers", "tags",
-            "subscribe_owner", "filed_by", "importance",
-            "milestone", "assignee", "cve"])
+            "datecreated", "information_type", "distribution",
+            "sourcepackagename", "product", "status", "subscribers", "tags",
+            "subscribe_owner", "filed_by", "importance", "milestone",
+            "assignee", "cve"])
 
 
 class BugTag(SQLBase):
@@ -360,7 +359,7 @@
     _security_related = BoolCol(
         dbName='security_related', notNull=True, default=False)
     information_type = EnumCol(
-        enum=InformationType, default=InformationType.PUBLIC)
+        enum=InformationType, notNull=True, default=InformationType.PUBLIC)
 
     # useful Joins
     activity = SQLMultipleJoin('BugActivity', joinColumn='bug', orderBy='id')
@@ -397,17 +396,11 @@
 
     @property
     def private(self):
-        if self.information_type:
-            return self.information_type in PRIVATE_INFORMATION_TYPES
-        else:
-            return self._private
+        return self.information_type in PRIVATE_INFORMATION_TYPES
 
     @property
     def security_related(self):
-        if self.information_type:
-            return self.information_type in SECURITY_INFORMATION_TYPES
-        else:
-            return self._security_related
+        return self.information_type in SECURITY_INFORMATION_TYPES
 
     @cachedproperty
     def _subscriber_cache(self):
@@ -1717,109 +1710,76 @@
 
         return bugtask
 
-    def setPrivacyAndSecurityRelated(self, private, security_related, who):
-        """ See `IBug`."""
-        private_changed = False
-        security_related_changed = False
-        bug_before_modification = Snapshot(self, providing=providedBy(self))
-
-        f_flag_str = 'disclosure.enhanced_private_bug_subscriptions.enabled'
-        f_flag = bool(getFeatureFlag(f_flag_str))
-        if f_flag:
-            # Before we update the privacy or security_related status, we
-            # need to reconcile the subscribers to avoid leaking private
-            # information.
-            if (self.private != private
-                    or self.security_related != security_related):
-                self.reconcileSubscribers(private, security_related, who)
-
-        if self.private != private:
-            # We do not allow multi-pillar private bugs except for those teams
-            # who want to shoot themselves in the foot.
-            if private:
-                allow_multi_pillar_private = bool(getFeatureFlag(
-                    'disclosure.allow_multipillar_private_bugs.enabled'))
-                if (not allow_multi_pillar_private
-                        and len(self.affected_pillars) > 1):
-                    raise BugCannotBePrivate(
-                        "Multi-pillar bugs cannot be private.")
-            private_changed = True
-            self._private = private
-
-            if private:
-                self.who_made_private = who
-                self.date_made_private = UTC_NOW
-            else:
-                self.who_made_private = None
-                self.date_made_private = None
-
-            # XXX: This should be a bulk update. RBC 20100827
-            # bug=https://bugs.launchpad.net/storm/+bug/625071
-            for attachment in self.attachments_unpopulated:
-                attachment.libraryfile.restricted = private
-
-        if self.security_related != security_related:
-            security_related_changed = True
-            self._security_related = security_related
-
-        if private_changed or security_related_changed:
-            # Correct the heat for the bug immediately, so that we don't have
-            # to wait for the next calculation job for the adjusted heat.
-            self.updateHeat()
-
-        self.information_type = convert_to_information_type(
-            self._private, self._security_related)
-
-        if private_changed or security_related_changed:
-            changed_fields = []
-
-            if private_changed:
-                changed_fields.append('private')
-                if not f_flag and private:
-                    # If we didn't call reconcileSubscribers, we may have
-                    # bug supervisors who should be on this bug, but aren't.
-                    supervisors = set()
-                    for bugtask in self.bugtasks:
-                        supervisors.add(bugtask.pillar.bug_supervisor)
-                    if None in supervisors:
-                        supervisors.remove(None)
-                    for s in supervisors:
-                        subscriptions = get_structural_subscriptions_for_bug(
-                                            self, s)
-                        if subscriptions != []:
-                            self.subscribe(s, who)
-
-            if security_related_changed:
-                changed_fields.append('security_related')
-                if not f_flag and security_related:
-                    # The bug turned out to be security-related, subscribe the
-                    # security contact. We do it here only if the feature flag
-                    # is not set, otherwise it's done in
-                    # reconcileSubscribers().
-                    for pillar in self.affected_pillars:
-                        if pillar.security_contact is not None:
-                            self.subscribe(pillar.security_contact, who)
-
-            notify(ObjectModifiedEvent(
-                    self, bug_before_modification, changed_fields, user=who))
-
-        return private_changed, security_related_changed
-
     def setPrivate(self, private, who):
         """See `IBug`.
 
         We also record who made the change and when the change took
         place.
         """
-        return self.setPrivacyAndSecurityRelated(
-            private, self.security_related, who)[0]
+        return self.transitionToInformationType(
+            convert_to_information_type(private, self.security_related), who)
 
     def setSecurityRelated(self, security_related, who):
         """Setter for the `security_related` property."""
-        return self.setPrivacyAndSecurityRelated(
-            self.private, security_related, who)[1]
-
-    def getRequiredSubscribers(self, for_private, for_security_related, who):
+        return self.transitionToInformationType(
+            convert_to_information_type(self.private, security_related), who)
+
+    def transitionToInformationType(self, information_type, who):
+        """See `IBug`."""
+        bug_before_modification = Snapshot(self, providing=providedBy(self))
+        if self.information_type == information_type:
+            return False
+        f_flag_str = 'disclosure.enhanced_private_bug_subscriptions.enabled'
+        f_flag = bool(getFeatureFlag(f_flag_str))
+        if f_flag:
+            self.reconcileSubscribers(information_type, who)
+        if information_type in PRIVATE_INFORMATION_TYPES:
+            allow_multi_pillar_private = bool(getFeatureFlag(
+                'disclosure.allow_multipillar_private_bugs.enabled'))
+            if (not allow_multi_pillar_private
+                    and len(self.affected_pillars) > 1):
+                raise BugCannotBePrivate(
+                    "Multi-pillar bugs cannot be private.")
+            self.who_made_private = who
+            self.date_made_private = UTC_NOW
+        else:
+            self.who_made_private = None
+            self.date_made_private = None
+        # XXX: This should be a bulk update. RBC 20100827
+        # bug=https://bugs.launchpad.net/storm/+bug/625071
+        for attachment in self.attachments_unpopulated:
+            attachment.libraryfile.restricted = (
+                information_type in PRIVATE_INFORMATION_TYPES)
+        self.updateHeat()
+        if not f_flag and information_type == InformationType.USERDATA:
+            # If we didn't call reconcileSubscribers(), we may have
+            # bug supervisors who should be on this bug, but aren't.
+            supervisors = set()
+            for bugtask in self.bugtasks:
+                supervisors.add(bugtask.pillar.bug_supervisor)
+            if None in supervisors:
+                supervisors.remove(None)
+            for s in supervisors:
+                if not get_structural_subscriptions_for_bug(self, s):
+                    self.subscribe(s, who)
+        if not f_flag and information_type in SECURITY_INFORMATION_TYPES:
+            # The bug turned out to be security-related, subscribe the
+            # security contact. We do it here only if the feature flag
+            # is not set, otherwise it's done in
+            # reconcileSubscribers().
+            for pillar in self.affected_pillars:
+                if pillar.security_contact is not None:
+                    self.subscribe(pillar.security_contact, who)
+        self.information_type = information_type
+        # Set the legacy attributes for now.
+        self._private = information_type in PRIVATE_INFORMATION_TYPES
+        self._security_related = (
+            information_type in SECURITY_INFORMATION_TYPES)
+        notify(ObjectModifiedEvent(
+                self, bug_before_modification, [information_type], user=who))
+        return True
+
+    def getRequiredSubscribers(self, information_type, who):
         """Return the mandatory subscribers for a bug with given attributes.
 
         When a bug is marked as private or security related, it is required
@@ -1835,23 +1795,23 @@
         If bug supervisor or security contact is unset, fallback to bugtask
         reporter/owner.
         """
-        if not for_private and not for_security_related:
+        if information_type == InformationType.PUBLIC:
             return set()
         result = set()
         result.add(self.owner)
         for bugtask in self.bugtasks:
             maintainer = bugtask.pillar.owner
-            if for_security_related:
+            if information_type in SECURITY_INFORMATION_TYPES:
                 result.add(bugtask.pillar.security_contact or maintainer)
-            if for_private:
+            if information_type in PRIVATE_INFORMATION_TYPES:
                 result.add(bugtask.pillar.bug_supervisor or maintainer)
-        if for_private:
+        if information_type in PRIVATE_INFORMATION_TYPES:
             subscribers_for_who = self.getSubscribersForPerson(who)
             if subscribers_for_who.is_empty():
                 result.add(who)
         return result
 
-    def getAutoRemovedSubscribers(self, for_private, for_security_related):
+    def getAutoRemovedSubscribers(self, information_type):
         """Return the to be removed subscribers for bug with given attributes.
 
         When a bug's privacy or security related attributes change, some
@@ -1865,6 +1825,8 @@
         """
         bug_supervisors = []
         security_contacts = []
+        for_security_related = information_type in SECURITY_INFORMATION_TYPES
+        for_private = information_type in PRIVATE_INFORMATION_TYPES
         for pillar in self.affected_pillars:
             if (self.security_related and not for_security_related
                 and pillar.security_contact):
@@ -1874,7 +1836,7 @@
                     bug_supervisors.append(pillar.bug_supervisor)
         return bug_supervisors, security_contacts
 
-    def reconcileSubscribers(self, for_private, for_security_related, who):
+    def reconcileSubscribers(self, information_type, who):
         """ Ensure only appropriate people are subscribed to private bugs.
 
         When a bug is marked as either private = True or security_related =
@@ -1894,9 +1856,9 @@
         current_direct_subscribers = (
             self.getSubscriptionInfo().direct_subscribers)
         required_subscribers = self.getRequiredSubscribers(
-            for_private, for_security_related, who)
+            information_type, who)
         removed_bug_supervisors, removed_security_contacts = (
-            self.getAutoRemovedSubscribers(for_private, for_security_related))
+            self.getAutoRemovedSubscribers(information_type))
         for subscriber in removed_bug_supervisors:
             recipients = BugNotificationRecipients()
             recipients.addBugSupervisor(subscriber)
@@ -1929,7 +1891,8 @@
         # unsubscribe any unauthorised direct subscribers.
         pillar = self.default_bugtask.pillar
         private_project = IProduct.providedBy(pillar) and pillar.private_bugs
-        if private_project and (for_private or for_security_related):
+        privileged_info = information_type != InformationType.PUBLIC
+        if private_project and privileged_info:
             allowed_subscribers = set()
             allowed_subscribers.add(self.owner)
             for bugtask in self.bugtasks:
@@ -2813,13 +2776,12 @@
         if params.product and params.product.private_bugs:
             # If the private_bugs flag is set on a product, then
             # force the new bug report to be private.
-            params.private = True
+            if params.information_type == InformationType.PUBLIC:
+                params.information_type = InformationType.USERDATA
 
         bug, event = self.createBugWithoutTarget(params)
 
-        if params.security_related:
-            assert params.private, (
-                "A security related bug should always be private by default.")
+        if params.information_type in SECURITY_INFORMATION_TYPES:
             if params.product:
                 context = params.product
             else:
@@ -2905,21 +2867,22 @@
             params.description = params.msg.text_contents
 
         extra_params = {}
-        if params.private:
+        if params.information_type in PRIVATE_INFORMATION_TYPES:
             # We add some auditing information. After bug creation
             # time these attributes are updated by Bug.setPrivate().
             extra_params.update(
                 date_made_private=params.datecreated,
                 who_made_private=params.owner)
 
-        information_type = convert_to_information_type(
-            params.private, params.security_related)
+        # Set the legacy attributes for now.
+        private = params.information_type in PRIVATE_INFORMATION_TYPES
+        security_related = (
+            params.information_type in SECURITY_INFORMATION_TYPES)
         bug = Bug(
             title=params.title, description=params.description,
-            _private=params.private, owner=params.owner,
-            datecreated=params.datecreated,
-            _security_related=params.security_related,
-            information_type=information_type,
+            owner=params.owner, datecreated=params.datecreated,
+            information_type=params.information_type,
+            _private=private, _security_related=security_related,
             **extra_params)
 
         if params.subscribe_owner:

=== modified file 'lib/lp/bugs/model/bugtask.py'
--- lib/lp/bugs/model/bugtask.py	2012-03-21 17:31:45 +0000
+++ lib/lp/bugs/model/bugtask.py	2012-03-29 05:56:22 +0000
@@ -43,10 +43,8 @@
     And,
     Join,
     Or,
-    Select,
     SQL,
     Sum,
-    Union,
     )
 from storm.store import (
     EmptyResultSet,
@@ -86,6 +84,7 @@
     UserCannotEditBugTaskMilestone,
     UserCannotEditBugTaskStatus,
     )
+from lp.registry.enums import PUBLIC_INFORMATION_TYPES
 from lp.registry.interfaces.distribution import (
     IDistribution,
     IDistributionSet,
@@ -1698,7 +1697,8 @@
     def getStatusCountsForProductSeries(self, user, product_series):
         """See `IBugTaskSet`."""
         if user is None:
-            bug_privacy_filter = 'AND Bug.private IS FALSE'
+            bug_privacy_filter = 'AND Bug.information_type IN %s' % (
+                sqlvalues(PUBLIC_INFORMATION_TYPES))
         else:
             # Since the count won't reveal sensitive information, and
             # since the get_bug_privacy_filter() check for non-admins is

=== modified file 'lib/lp/bugs/model/tests/test_bug.py'
--- lib/lp/bugs/model/tests/test_bug.py	2012-03-26 00:12:50 +0000
+++ lib/lp/bugs/model/tests/test_bug.py	2012-03-29 05:56:22 +0000
@@ -603,8 +603,11 @@
             removeSecurityProxy(bug_product).private_bugs = True
         bug = self.factory.makeBug(owner=bug_owner, product=bug_product)
         with person_logged_in(bug_owner):
-            bug.setPrivacyAndSecurityRelated(
-                private_security_related, private_security_related, bug_owner)
+            if private_security_related:
+                information_type = InformationType.EMBARGOEDSECURITY
+            else:
+                information_type = InformationType.PUBLIC
+            bug.transitionToInformationType(information_type, bug_owner)
         owner_a = self.factory.makePerson(name='ownera')
         product_series_a = self.factory.makeProductSeries(
             product=bug_product, owner=owner_a)
@@ -639,8 +642,8 @@
             for subscriber in initial_subscribers:
                 bug.subscribe(subscriber, bug_owner)
             who = self.factory.makePerson()
-            bug.setPrivacyAndSecurityRelated(
-                private=True, security_related=True, who=who)
+            bug.transitionToInformationType(
+                InformationType.EMBARGOEDSECURITY, who=who)
             subscribers = bug.getDirectSubscribers()
         expected_subscribers = set((
             bugtask_a.owner,
@@ -672,8 +675,7 @@
             for subscriber in initial_subscribers:
                 bug.subscribe(subscriber, bug_owner)
             who = self.factory.makePerson()
-            bug.setPrivacyAndSecurityRelated(
-                private=True, security_related=False, who=who)
+            bug.transitionToInformationType(InformationType.USERDATA, who)
             subscribers = bug.getDirectSubscribers()
         expected_subscribers = set((
             default_bugtask.pillar.bug_supervisor,
@@ -704,8 +706,8 @@
             for subscriber in initial_subscribers:
                 bug.subscribe(subscriber, bug_owner)
             who = self.factory.makePerson()
-            bug.setPrivacyAndSecurityRelated(
-                private=False, security_related=True, who=who)
+            bug.transitionToInformationType(
+                InformationType.UNEMBARGOEDSECURITY, who)
             subscribers = bug.getDirectSubscribers()
         expected_subscribers = set((
             default_bugtask.pillar.driver,
@@ -731,8 +733,7 @@
                 bug.subscribe(subscriber, bug_owner)
             who = self.factory.makePerson()
             expected_direct_subscribers = set(bug.getDirectSubscribers())
-            bug.setPrivacyAndSecurityRelated(
-                private=False, security_related=False, who=who)
+            bug.transitionToInformationType(InformationType.PUBLIC, who)
         subscribers = set(bug.getDirectSubscribers())
         expected_direct_subscribers.difference_update(
             (default_bugtask.pillar.security_contact,
@@ -747,8 +748,7 @@
         bug = self.factory.makeBug(owner=bug_owner)
         with person_logged_in(bug_owner):
             who = self.factory.makePerson()
-            bug.setPrivacyAndSecurityRelated(
-                private=True, security_related=False, who=who)
+            bug.transitionToInformationType(InformationType.USERDATA, who)
             subscribers = bug.getDirectSubscribers()
         naked_bugtask = removeSecurityProxy(bug).default_bugtask
         self.assertContentEqual(
@@ -762,8 +762,8 @@
         bug = self.factory.makeBug(owner=bug_owner)
         with person_logged_in(bug_owner):
             who = self.factory.makePerson()
-            bug.setPrivacyAndSecurityRelated(
-                private=False, security_related=True, who=who)
+            bug.transitionToInformationType(
+                InformationType.UNEMBARGOEDSECURITY, who)
             subscribers = bug.getDirectSubscribers()
         naked_bugtask = removeSecurityProxy(bug).default_bugtask
         self.assertContentEqual(
@@ -833,8 +833,8 @@
         with person_logged_in(bug_owner):
             bug.subscribe(default_bugtask.pillar.bug_supervisor, bug_owner)
             who = self.factory.makePerson(name="who")
-            bug.setPrivacyAndSecurityRelated(
-                private=False, security_related=True, who=who)
+            bug.transitionToInformationType(
+                InformationType.UNEMBARGOEDSECURITY, who)
             subscribers = bug.getDirectSubscribers()
             self.assertNotIn(
                 default_bugtask.pillar.bug_supervisor, subscribers)
@@ -863,8 +863,7 @@
         self.assertFalse(bug_supervisor in bug.getDirectSubscribers())
         with person_logged_in(bug_owner):
             who = self.factory.makePerson(name="who")
-            bug.setPrivacyAndSecurityRelated(
-                private=True, security_related=False, who=who)
+            bug.transitionToInformationType(InformationType.USERDATA, who)
         self.assertTrue(bug_supervisor in bug.getDirectSubscribers())
 
     def test_securityContactUnsubscribedIfBugNotSecurityRelated(self):
@@ -878,8 +877,7 @@
         with person_logged_in(bug_owner):
             bug.subscribe(bugtask_a.pillar.security_contact, bug_owner)
             who = self.factory.makePerson(name="who")
-            bug.setPrivacyAndSecurityRelated(
-                private=True, security_related=False, who=who)
+            bug.transitionToInformationType(InformationType.USERDATA, who)
             subscribers = bug.getDirectSubscribers()
             self.assertFalse(bugtask_a.pillar.security_contact in subscribers)
 
@@ -905,17 +903,16 @@
         self.factory.makeBugTask(bug=bug, target=product)
         login_person(bug.owner)
         self.assertRaises(
-            BugCannotBePrivate, bug.setPrivacyAndSecurityRelated, True, False,
-            bug.owner)
-        self.assertRaises(
-            BugCannotBePrivate, bug.setPrivate, True, bug.owner)
+            BugCannotBePrivate, bug.transitionToInformationType,
+            InformationType.USERDATA, bug.owner)
 
         # Some teams though need multi-pillar private bugs.
         feature_flag = {
             'disclosure.allow_multipillar_private_bugs.enabled': 'on'
             }
         with FeatureFixture(feature_flag):
-            bug.setPrivacyAndSecurityRelated(True, False, bug.owner)
+            bug.transitionToInformationType(
+                InformationType.USERDATA, bug.owner)
             self.assertTrue(bug.private)
 
     def test_bug_information_type(self):
@@ -960,7 +957,7 @@
         bug = self.factory.makeBug(
             private=True, security_related=True, owner=owner)
         with person_logged_in(owner):
-            bug.setPrivacyAndSecurityRelated(False, False, owner)
+            bug.transitionToInformationType(InformationType.PUBLIC, owner)
         self.assertEqual(InformationType.PUBLIC, bug.information_type)
 
     def test_public_to_private_information_type(self):

=== modified file 'lib/lp/bugs/scripts/bugimport.py'
--- lib/lp/bugs/scripts/bugimport.py	2012-03-22 23:21:24 +0000
+++ lib/lp/bugs/scripts/bugimport.py	2012-03-29 05:56:22 +0000
@@ -40,6 +40,7 @@
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
 from lp.services.librarian.interfaces import ILibraryFileAliasSet
 from lp.services.messages.interfaces.message import IMessageSet
+from lp.bugs.adapters.bug import convert_to_information_type
 from lp.bugs.interfaces.bug import (
     CreateBugParams,
     IBugSet,
@@ -295,6 +296,8 @@
         # If the product has private_bugs, we force private to True.
         if self.product.private_bugs:
             private = True
+        information_type = convert_to_information_type(
+            private, security_related)
 
         if owner is None:
             owner = self.bug_importer
@@ -302,12 +305,8 @@
         msg = self.createMessage(commentnode, defaulttitle=title)
 
         bug = self.product.createBug(CreateBugParams(
-            msg=msg,
-            datecreated=datecreated,
-            title=title,
-            private=private or security_related,
-            security_related=security_related,
-            owner=owner))
+            msg=msg, datecreated=datecreated, title=title,
+            information_type=information_type, owner=owner))
         bugtask = bug.bugtasks[0]
         self.logger.info('Creating Launchpad bug #%d', bug.id)
 
@@ -324,8 +323,9 @@
 
         # Security bugs must be created private, so set it correctly.
         if not self.product.private_bugs:
-            bug.setPrivacyAndSecurityRelated(
-                private, security_related, owner)
+            information_type = convert_to_information_type(
+                private, security_related)
+            bug.transitionToInformationType(information_type, owner)
         bug.name = get_value(bugnode, 'nickname')
         description = get_value(bugnode, 'description')
         if description:

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-activity.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-activity.txt	2011-12-02 17:44:47 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-activity.txt	2012-03-29 05:56:22 +0000
@@ -123,6 +123,12 @@
     public => private
     --------
 
+    >>> admin_browser.open(
+    ...     'http://bugs.launchpad.dev/redfish/+bug/15/+secrecy')
+    >>> admin_browser.getControl(
+    ...     "This bug report should be private").selected = False
+    >>> admin_browser.getControl("Change").click()
+
 Clean up the feature flag.
     >>> flags.cleanUp()
 

=== modified file 'lib/lp/bugs/xmlrpc/bug.py'
--- lib/lp/bugs/xmlrpc/bug.py	2012-01-01 02:58:52 +0000
+++ lib/lp/bugs/xmlrpc/bug.py	2012-03-29 05:56:22 +0000
@@ -1,10 +1,13 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """XML-RPC APIs for Malone."""
 
 __metaclass__ = type
-__all__ = ["FileBugAPI", "ExternalBugTrackerTokenAPI"]
+__all__ = [
+    "ExternalBugTrackerTokenAPI",
+    "FileBugAPI",
+    ]
 
 from zope.component import getUtility
 from zope.interface import implements
@@ -12,6 +15,7 @@
 from lp.app.errors import NotFoundError
 from lp.bugs.interfaces.bug import CreateBugParams
 from lp.bugs.interfaces.externalbugtracker import IExternalBugTrackerTokenAPI
+from lp.registry.enums import InformationType
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.product import IProductSet
@@ -100,14 +104,14 @@
                 else:
                     subscriber_list.append(subscriber)
 
-        security_related = bool(security_related)
-
-        # Privacy is always set the same as security, by default.
-        private = security_related
+        if security_related:
+            information_type = InformationType.EMBARGOEDSECURITY
+        else:
+            information_type = InformationType.PUBLIC
 
         params = CreateBugParams(
             owner=self.user, title=summary, comment=comment,
-            security_related=security_related, private=private,
+            information_type=information_type,
             subscribers=subscriber_list)
 
         bug = target.createBug(params)

=== modified file 'lib/lp/registry/enums.py'
--- lib/lp/registry/enums.py	2012-03-25 23:33:53 +0000
+++ lib/lp/registry/enums.py	2012-03-29 05:56:22 +0000
@@ -10,6 +10,7 @@
     'InformationType',
     'PersonTransferJobType',
     'PRIVATE_INFORMATION_TYPES',
+    'PUBLIC_INFORMATION_TYPES',
     'ProductJobType',
     'SECURITY_INFORMATION_TYPES',
     'SharingPermission',
@@ -63,6 +64,10 @@
         """)
 
 
+PUBLIC_INFORMATION_TYPES = (
+    InformationType.PUBLIC, InformationType.UNEMBARGOEDSECURITY)
+
+
 PRIVATE_INFORMATION_TYPES = (
     InformationType.EMBARGOEDSECURITY, InformationType.USERDATA,
     InformationType.PROPRIETARY)

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2012-03-27 19:46:03 +0000
+++ lib/lp/registry/model/person.py	2012-03-29 05:56:22 +0000
@@ -147,6 +147,7 @@
     HasMergeProposalsMixin,
     HasRequestedReviewsMixin,
     )
+from lp.registry.enums import PRIVATE_INFORMATION_TYPES
 from lp.registry.errors import (
     InvalidName,
     JoinNotAllowed,
@@ -1849,14 +1850,16 @@
                     Bug,
                     Join(BugSubscription, BugSubscription.bug_id == Bug.id)),
                 where=And(
-                    Bug._private == True,
+                    Bug.information_type.is_in(PRIVATE_INFORMATION_TYPES),
                     BugSubscription.person_id == self.id)),
             Select(
                 Bug.id,
                 tables=(
                     Bug,
                     Join(BugTask, BugTask.bugID == Bug.id)),
-                where=And(Bug._private == True, BugTask.assignee == self.id)),
+                where=And(Bug.information_type.is_in(
+                    PRIVATE_INFORMATION_TYPES),
+                    BugTask.assignee == self.id)),
             limit=1))
         if private_bugs_involved.rowcount:
             raise TeamSubscriptionPolicyError(

=== modified file 'lib/lp/security.py'
--- lib/lp/security.py	2012-03-19 16:02:52 +0000
+++ lib/lp/security.py	2012-03-29 05:56:22 +0000
@@ -986,6 +986,7 @@
             user_private_bugs_visible_filter = get_bug_privacy_filter(
                 user.person, private_only=True)
 
+            # 1 = PUBLIC, 2 = UNEMBARGOEDSECURITY
             query = """
                 SELECT TRUE WHERE
                 EXISTS (
@@ -1005,7 +1006,8 @@
                     -- do those first.
                     %(team_bug_select)s
                     WHERE bug_id in (
-                        SELECT Bug.id FROM Bug WHERE Bug.private is FALSE
+                        SELECT Bug.id FROM Bug WHERE Bug.information_type IN
+                        (1, 2)
                     )
                     UNION ALL
                     -- Now do the private bugs the user can see.

=== modified file 'lib/lp/systemhomes.py'
--- lib/lp/systemhomes.py	2011-12-30 07:32:58 +0000
+++ lib/lp/systemhomes.py	2012-03-29 05:56:22 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Content classes for the 'home pages' of the subsystems of Launchpad."""
@@ -24,6 +24,7 @@
 from zope.component import getUtility
 from zope.interface import implements
 
+from lp.bugs.adapters.bug import convert_to_information_type
 from lp.bugs.errors import InvalidBugTargetType
 from lp.bugs.interfaces.bug import (
     CreateBugParams,
@@ -126,9 +127,11 @@
     def createBug(self, owner, title, description, target,
                   security_related=False, private=False, tags=None):
         """See `IMaloneApplication`."""
+        information_type = convert_to_information_type(
+            private, security_related)
         params = CreateBugParams(
             title=title, comment=description, owner=owner,
-            security_related=security_related, private=private, tags=tags)
+            information_type=information_type, tags=tags)
         if IProduct.providedBy(target):
             params.setBugTarget(product=target)
         elif IDistribution.providedBy(target):

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2012-03-28 18:13:37 +0000
+++ lib/lp/testing/factory.py	2012-03-29 05:56:22 +0000
@@ -77,6 +77,7 @@
     )
 from lp.blueprints.interfaces.specification import ISpecificationSet
 from lp.blueprints.interfaces.sprint import ISprintSet
+from lp.bugs.adapters.bug import convert_to_information_type
 from lp.bugs.interfaces.bug import (
     CreateBugParams,
     IBugSet,
@@ -1688,9 +1689,11 @@
             self.makeSourcePackagePublishingHistory(
                 distroseries=distribution.currentseries,
                 sourcepackagename=sourcepackagename)
+        # Factory changes delayed for a seperate branch.
+        information_type = convert_to_information_type(
+            private, security_related)
         create_bug_params = CreateBugParams(
-            owner, title, comment=comment, private=private,
-            security_related=security_related,
+            owner, title, comment=comment, information_type=information_type,
             datecreated=date_created, description=description,
             status=status, tags=tags)
         create_bug_params.setBugTarget(