launchpad-reviewers team mailing list archive

[Colin Watson <mp+412205@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:security-skip-dbr-schema into launchpad:master.

Commit message:
Don't warn about missing permissions in dbr schema

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

This is used for metrics in some of our environments, and is none of `security.py`'s business.

See https://irclogs.canonical.com/2015/02/20/%23launchpad-ops.html#t14:42 for some historical background on this.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:security-skip-dbr-schema into launchpad:master.

diff --git a/database/schema/security.py b/database/schema/security.py
index 653a126..20aebe2 100755
--- a/database/schema/security.py
+++ b/database/schema/security.py
@@ -653,6 +653,10 @@ def reset_permissions(con, config, options):
     # had permissions assigned.
     forgotten = set()
     for obj in schema.values():
+        if obj.schema == "dbr":
+            # The "dbr" schema is used for metrics in some environments, and
+            # is none of our business.
+            continue
         if obj not in found:
             forgotten.add(obj)
     forgotten = [obj.fullname for obj in forgotten