launchpad-reviewers team mailing list archive

[Colin Watson <mp+412908@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:update-permission-comments into launchpad:master.

Commit message:
Update some "consult with ..."-type comments

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/412908

It doesn't make sense to tell developers to consult with people who no longer work on Launchpad or Ubuntu; and while of course we still need to take care to avoid moving lots of files around on mirrors by incautious changes to Soyuz, the CEO probably isn't the best domain expert on that any more.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:update-permission-comments into launchpad:master.

diff --git a/lib/lp/registry/configure.zcml b/lib/lp/registry/configure.zcml
index 0ccf396..7edbccb 100644
--- a/lib/lp/registry/configure.zcml
+++ b/lib/lp/registry/configure.zcml
@@ -313,9 +313,9 @@
             permission="launchpad.LanguagePacksAdmin"
             set_attributes="language_pack_base language_pack_delta                                                                                                 language_pack_proposed                                                                                                 language_pack_full_export_requested"/>
 
-        <!-- NB: check with SABDFL before modifying these, there is potential to
-                                 make a huge mess if these get changed and Soyuz has to republish
-                                 shedloads of data. -->
+        <!-- NB: check carefully before modifying these, there is potential to
+             make a huge mess if these get changed and Soyuz has to republish
+             shedloads of data. -->
 
         <require
             permission="launchpad.Edit"
@@ -334,9 +334,9 @@
                 strict_supported_component_dependencies
                 inherit_overrides_from_parents"/>
 
-        <!-- NB: check with SABDFL before modifying these, there is potential to
-                                 make a huge mess if these get changed and Soyuz has to republish
-                                 shedloads of data. -->
+        <!-- NB: check carefully before modifying these, there is potential to
+             make a huge mess if these get changed and Soyuz has to republish
+             shedloads of data. -->
 
         <require
             permission="launchpad.Moderate"
diff --git a/lib/lp/registry/scripts/distributionmirror_prober.py b/lib/lp/registry/scripts/distributionmirror_prober.py
index b48fa7a..4d65294 100644
--- a/lib/lp/registry/scripts/distributionmirror_prober.py
+++ b/lib/lp/registry/scripts/distributionmirror_prober.py
@@ -772,9 +772,7 @@ class ArchiveMirrorProberCallbacks(LoggingMixin):
         if failure.check(*self.expected_failures) is not None:
             self.logMessage(msg)
         else:
-            # This is not an error we expect from an HTTP server, so we log it
-            # using the cronscript's logger and wait for kiko to complain
-            # about it.
+            # This is not an error we expect from an HTTP server.
             logger = logging.getLogger('distributionmirror-prober')
             logger.error(msg)
         return None
@@ -814,9 +812,7 @@ class MirrorCDImageProberCallbacks(LoggingMixin):
                     msg = ("%s on mirror %s. Check its logfile for more "
                            "details.\n"
                            % (response.getErrorMessage(), self.mirror.name))
-                    # This is not an error we expect from an HTTP server, so
-                    # we log it using the cronscript's logger and wait for
-                    # kiko to complain about it.
+                    # This is not an error we expect from an HTTP server.
                     logger = logging.getLogger('distributionmirror-prober')
                     logger.error(msg)
                 return None
diff --git a/lib/lp/security.py b/lib/lp/security.py
index 8435167..9f6690e 100644
--- a/lib/lp/security.py
+++ b/lib/lp/security.py
@@ -1358,10 +1358,10 @@ class AdminDistroSeries(AdminByAdminsTeam):
     so for the moment we are locking down admin and edit on distributions
     and distroseriess to the Launchpad admin team.
 
-    NB: Please consult with SABDFL before modifying this permission because
+    NB: Please consult carefully before modifying this permission because
         changing it could cause the archive to get rearranged, with tons of
         files moved to the new namespace, and mirrors would get very very
-        upset. Then James T would be on your case.
+        upset.
     """
     permission = 'launchpad.Admin'
     usedfor = IDistroSeries
@@ -1372,9 +1372,8 @@ class EditDistroSeriesByReleaseManagerOrDistroOwnersOrAdmins(
     """The owner of the distro series (i.e. the owner of the distribution)
     should be able to modify some of the fields on the IDistroSeries
 
-    NB: there is potential for a great mess if this is not done correctly so
-    please consult with Kiko and MDZ on the mailing list before modifying
-    these permissions.
+    NB: there is potential for a great mess if this is not done correctly,
+    so please consult carefully before modifying these permissions.
     """
     permission = 'launchpad.Edit'
     usedfor = IDistroSeries