Launchpad itself

Merge lp:~wgrant/launchpad/gpgkey-fks-final-semi-final into lp:launchpad

  1. gpgkey-fks-final-semi-final
  2. Merge into devel
Proposed by William Grant
Status: Merged
Merged at revision: 17949
Proposed branch: lp:~wgrant/launchpad/gpgkey-fks-final-semi-final
Merge into: lp:launchpad
Diff against target: 145 lines (+3/-16)
9 files modified
lib/lp/archivepublisher/archivesigningkey.py (+0/-2)
lib/lp/registry/model/codeofconduct.py (+1/-3)
lib/lp/registry/model/distroseries.py (+0/-2)
lib/lp/soyuz/configure.zcml (+1/-1)
lib/lp/soyuz/model/archive.py (+1/-3)
lib/lp/soyuz/model/queue.py (+0/-2)
lib/lp/soyuz/model/sourcepackagerelease.py (+0/-1)
lib/lp/soyuz/scripts/gina/handlers.py (+0/-1)
lib/lp/soyuz/tests/test_build_notify.py (+0/-1)
To merge this branch: bzr merge lp:~wgrant/launchpad/gpgkey-fks-final-semi-final
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+289170@code.launchpad.net

Commit message

Stop setting the old GPGKey foreign key columns.

Description of the change

Stop setting the old GPGKey foreign key columns.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/archivepublisher/archivesigningkey.py'
2--- lib/lp/archivepublisher/archivesigningkey.py 2016-03-02 14:13:39 +0000
3+++ lib/lp/archivepublisher/archivesigningkey.py 2016-03-16 11:37:15 +0000
4@@ -72,7 +72,6 @@
5 if default_ppa.signing_key is None:
6 IArchiveSigningKey(default_ppa).generateSigningKey()
7 key = default_ppa.signing_key
8- self.archive._signing_key = key
9 self.archive.signing_key_owner = key.owner
10 self.archive.signing_key_fingerprint = key.fingerprint
11 del get_property_cache(self.archive).signing_key
12@@ -113,7 +112,6 @@
13 key = getUtility(IGPGKeySet).new(
14 key_owner, pub_key.keyid, pub_key.fingerprint, pub_key.keysize,
15 algorithm, active=True, can_encrypt=pub_key.can_encrypt)
16- self.archive._signing_key = key
17 self.archive.signing_key_owner = key.owner
18 self.archive.signing_key_fingerprint = key.fingerprint
19 del get_property_cache(self.archive).signing_key
20
21=== modified file 'lib/lp/registry/model/codeofconduct.py'
22--- lib/lp/registry/model/codeofconduct.py 2016-03-02 14:13:39 +0000
23+++ lib/lp/registry/model/codeofconduct.py 2016-03-16 11:37:15 +0000
24@@ -181,8 +181,6 @@
25
26 signedcode = StringCol(dbName='signedcode', notNull=False, default=None)
27
28- _signingkey = ForeignKey(foreignKey="GPGKey", dbName="signingkey",
29- notNull=False, default=None)
30 signing_key_fingerprint = Unicode()
31
32 datecreated = UtcDateTimeCol(dbName='datecreated', notNull=True,
33@@ -315,7 +313,7 @@
34
35 # Store the signature
36 signed = SignedCodeOfConduct(
37- owner=user, _signingkey=gpg,
38+ owner=user,
39 signing_key_fingerprint=gpg.fingerprint if gpg else None,
40 signedcode=signedcode, active=True)
41
42
43=== modified file 'lib/lp/registry/model/distroseries.py'
44--- lib/lp/registry/model/distroseries.py 2016-03-02 14:13:39 +0000
45+++ lib/lp/registry/model/distroseries.py 2016-03-16 11:37:15 +0000
46@@ -1164,7 +1164,6 @@
47 architecturehintlist=architecturehintlist, component=component,
48 creator=creator, urgency=urgency, changelog=changelog,
49 changelog_entry=changelog_entry, dsc=dsc,
50- _dscsigningkey=dscsigningkey,
51 signing_key_owner=dscsigningkey.owner if dscsigningkey else None,
52 signing_key_fingerprint=(
53 dscsigningkey.fingerprint if dscsigningkey else None),
54@@ -1353,7 +1352,6 @@
55 return PackageUpload(
56 distroseries=self, status=PackageUploadStatus.NEW,
57 pocket=pocket, archive=archive, changesfile=changes_file_alias,
58- _signing_key=signing_key,
59 signing_key_owner=signing_key.owner if signing_key else None,
60 signing_key_fingerprint=(
61 signing_key.fingerprint if signing_key else None),
62
63=== modified file 'lib/lp/soyuz/configure.zcml'
64--- lib/lp/soyuz/configure.zcml 2016-03-02 14:13:39 +0000
65+++ lib/lp/soyuz/configure.zcml 2016-03-16 11:37:15 +0000
66@@ -390,7 +390,7 @@
67 <require
68 permission="launchpad.InternalScriptsOnly"
69 attributes="signing_key_owner"
70- set_attributes="distribution _signing_key signing_key_owner
71+ set_attributes="distribution signing_key_owner
72 signing_key_fingerprint"/>
73 </class>
74 <adapter
75
76=== modified file 'lib/lp/soyuz/model/archive.py'
77--- lib/lp/soyuz/model/archive.py 2016-03-02 17:51:02 +0000
78+++ lib/lp/soyuz/model/archive.py 2016-03-16 11:37:15 +0000
79@@ -339,8 +339,6 @@
80
81 date_created = UtcDateTimeCol(dbName='date_created')
82
83- _signing_key = ForeignKey(
84- foreignKey='GPGKey', dbName='signing_key', notNull=False)
85 signing_key_owner_id = Int(name="signing_key_owner")
86 signing_key_owner = Reference(signing_key_owner_id, 'Person.id')
87 signing_key_fingerprint = Unicode()
88@@ -2541,7 +2539,7 @@
89 new_archive = Archive(
90 owner=owner, distribution=distribution, name=name,
91 displayname=displayname, description=description,
92- purpose=purpose, publish=publish, _signing_key=signing_key,
93+ purpose=purpose, publish=publish,
94 signing_key_owner=signing_key.owner if signing_key else None,
95 signing_key_fingerprint=(
96 signing_key.fingerprint if signing_key else None),
97
98=== modified file 'lib/lp/soyuz/model/queue.py'
99--- lib/lp/soyuz/model/queue.py 2016-03-02 14:13:39 +0000
100+++ lib/lp/soyuz/model/queue.py 2016-03-16 11:37:15 +0000
101@@ -185,8 +185,6 @@
102
103 archive = ForeignKey(dbName="archive", foreignKey="Archive", notNull=True)
104
105- _signing_key = ForeignKey(
106- foreignKey='GPGKey', dbName='signing_key', notNull=False)
107 signing_key_owner_id = Int(name="signing_key_owner")
108 signing_key_owner = Reference(signing_key_owner_id, 'Person.id')
109 signing_key_fingerprint = Unicode()
110
111=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
112--- lib/lp/soyuz/model/sourcepackagerelease.py 2016-03-02 14:13:39 +0000
113+++ lib/lp/soyuz/model/sourcepackagerelease.py 2016-03-16 11:37:15 +0000
114@@ -91,7 +91,6 @@
115 maintainer = ForeignKey(
116 dbName='maintainer', foreignKey='Person',
117 storm_validator=validate_public_person, notNull=True)
118- _dscsigningkey = ForeignKey(foreignKey='GPGKey', dbName='dscsigningkey')
119 signing_key_owner_id = Int(name="signing_key_owner")
120 signing_key_owner = Reference(signing_key_owner_id, 'Person.id')
121 signing_key_fingerprint = Unicode()
122
123=== modified file 'lib/lp/soyuz/scripts/gina/handlers.py'
124--- lib/lp/soyuz/scripts/gina/handlers.py 2016-03-02 14:13:39 +0000
125+++ lib/lp/soyuz/scripts/gina/handlers.py 2016-03-16 11:37:15 +0000
126@@ -615,7 +615,6 @@
127 component=componentID,
128 sourcepackagename=name.id,
129 maintainer=maintainer.id,
130- _dscsigningkey=key,
131 signing_key_owner=key.owner if key else None,
132 signing_key_fingerprint=key.fingerprint if key else None,
133 urgency=ChangesFile.urgency_map[src.urgency],
134
135=== modified file 'lib/lp/soyuz/tests/test_build_notify.py'
136--- lib/lp/soyuz/tests/test_build_notify.py 2016-03-02 15:52:33 +0000
137+++ lib/lp/soyuz/tests/test_build_notify.py 2016-03-16 11:37:15 +0000
138@@ -84,7 +84,6 @@
139 self.factory.getUniqueInteger(), status.value),
140 distroseries=self.distroseries, architecturehintlist='any',
141 creator=self.creator, archive=archive)
142- spph.sourcepackagerelease._dscsigningkey = self.gpgkey
143 spph.sourcepackagerelease.signing_key_fingerprint = (
144 self.gpgkey.fingerprint)
145 spph.sourcepackagerelease.signing_key_owner = (