# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: devel@johan.kiviniemi.name-20130522151325-\
#   vyq0brskg7uf1elm
# target_branch: http://bazaar.launchpad.net/~ubuntu-core-\
#   dev/software-properties/main/
# testament_sha1: 8a36a66343b956168d5f4b2df0798b1c85f15bf1
# timestamp: 2013-05-22 18:13:45 +0300
# base_revision_id: michael.vogt@ubuntu.com-20130507131837-\
#   4c3tneb1r80s8oy3
# 
# Begin patch
=== modified file 'softwareproperties/ppa.py'
--- softwareproperties/ppa.py	2013-02-27 20:15:21 +0000
+++ softwareproperties/ppa.py	2013-05-22 15:13:25 +0000
@@ -239,7 +239,11 @@
             cleanup(tmp_keyring_dir)
             return False
         # and add it
-        res = subprocess.call(["apt-key", "add", tmp_keyring])
+        trustedgpgd = apt_pkg.config.find_dir("Dir::Etc::trustedparts")
+        apt_keyring = os.path.join(trustedgpgd, "%s-%s.gpg" % (
+            encode(owner_name), encode(ppa_name)))
+        res = subprocess.call(["apt-key", "--keyring", apt_keyring, "add",
+            tmp_keyring])
         # cleanup
         cleanup(tmp_keyring_dir)
         return (res == 0)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWtRSxYAAZLfgARQUmf/93YY
SAq////6UAP6q2xru9B27OXvYZEmieITE1PQ0NTaAk9TNR+qPKaek9IyDKT1T1T08qf6RT00m00T
RtRkaaYAmIwASRASNMEZTaUeoaB6gAZAA0DJTFPU9EANGmjRoAAAAABJRTJk1P1NPUj1PCQyB6TJ
6CDTCDaJBGepZ24dg2UTO6+RZJtwDZvHTSD3JJ0VWOVHv9WVAidMB2iklRFORrE54dnMn2Jh1/re
NUnspVA+GmlzqdWjWyU7I7VTm8Pg4Pu8b3/Z95n8qdfoaRDBr2ji9R8TEKg7PI2SXCr1kdnBuHzo
ZPZ3OQsrkhOTrJb6lxz7Y8dEVmTdAXBvIuUHSOnDR1pJxMT6yU1GZBclBVP0Kn3KNUPN1IB7Cj72
f/UXLYWJ8y1m+EjKbSAiP2LAVXXLXK94RCZAXuUZcEO9PDlM7Ek2ZGIJPBsYMZtszEGuwQmgYCcg
LHSdJK4VOGV4bC1xLObi1NsMBx3jFMc14U9WU6s+O2EcrLilWxMtpkokSuWNoq72CiUeMIMKpbrJ
PBjlxmVTVt0cwqTq9CNYZNupbVWlWOdFNQ8tPlQJJ4CEDC7P4/ALljoKisbKtRUmqNLbbIYbkc3m
a5bTW7O+1mv6tR9mVN15wrPSWwryrN2ljgoElFGowNgAmvI6trCGV1GpfR5Id6lwktPaBkCFB0cp
YljRkXpdM+WNRrUC+2Lx4qIzWwDOdOXPH8JTNiMJQOVAhlZhEPjAgihkxbJya0eKwYy2u54mbrXk
VXCoytISjhvt2CAKncBogeAvjiZp49miacQ64r3AWooeBjSTe99KsY34FW6FkpiL1ytKyjhJ1oqC
bBtCZPareEHiP8uN/pmG4AeTOdPwtg2DUguo3HzlFEBtWeeAHnqMBcExKhRu2lL+FLrjRjelf8Uc
iYgbQB39PANKHRmrnpuKxvNlAveS0Bx6Atrpj4A1xMD27fG4TjHt42fTqGsDt4RliDIr3FCBzQ1h
gNVcjHRtQZRAtvXUBwocS5op+3omNAhUpODSZ3UEDugHgfFD4ekHf0QYbXJXc1K2ExaBZFiJEFeN
8FQDSX34yWAKeJForFWVYLCIwbVTEP1VJgOuFJ96JODdCUEmGa4uFg0dhRFip2DQQ2TgTmh2V6dc
1XDgNv7uS7uIE0WB51vcA8CBtU11X/PQ6HKuICTQiHZbE0PPMjTFhySee3Ca64ic+wPUMt1n7FVq
Ae0n9w4ZRJHXKA412xdmC6QGq3VqDKBZD/Q8zy6KUZF+bF2QN4RUXglRcQcN7S1TiL1KIaRK7giA
K8fbxPKYDXtMbgJAPe9VXcGm0xVmBSyaFR80HAUeRROD6qSvolAaFaxieUlh2E1I2c4MOTXtFFGe
0fWtJf8XckU4UJBrUUsW