Software Properties

Merge lp:~feng-kylin/software-properties/fix-1306494 into lp:software-properties

  1. fix-1306494
  2. Merge into main
Proposed by handsome_feng
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 918
Merged at revision: 918
Proposed branch: lp:~feng-kylin/software-properties/fix-1306494
Merge into: lp:software-properties
Diff against target: 13 lines (+3/-0)
1 file modified
softwareproperties/AptAuth.py (+3/-0)
To merge this branch: bzr merge lp:~feng-kylin/software-properties/fix-1306494
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Michael Vogt (community) Approve
Review via email: mp+240081@code.launchpad.net

Description of the change

added some known keys

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) :
review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwareproperties/AptAuth.py'
2--- softwareproperties/AptAuth.py 2014-02-28 21:29:48 +0000
3+++ softwareproperties/AptAuth.py 2014-10-30 08:15:14 +0000
4@@ -38,6 +38,9 @@
5 # some known keys
6 N_("Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>")
7 N_("Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>")
8+N_("Ubuntu Archive Automatic Signing Key (2012) <ftpmaster@ubuntu.com>")
9+N_("Ubuntu CD Image Automatic Signing Key (2012) <cdimage@ubuntu.com>")
10+N_("Ubuntu Extras Archive Automatic Signing Key <ftpmaster@ubuntu.com>")
11
12 class AptAuth:
13 def __init__(self, rootdir="/"):

Subscribers

People subscribed via source and target branches

to status/vote changes: