A regression was introduced which would raise an exception when
VerifyText returned an empty key string. This fixes that issue.


Cheers,
Daniel
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
#   ru2uqoa9lkjagzsb
# target_branch: ../trunk
# testament_sha1: e2639f29e6ceb89b7bc42e0f3e4787043b348f56
# timestamp: 2008-04-03 16:08:46 +0200
# base_revision_id: [EMAIL PROTECTED]
#   hnsoywvk9on3h9g5
# 
# Begin patch
=== modified file 'seahorse.py'
--- seahorse.py	2008-04-03 11:29:04 +0000
+++ seahorse.py	2008-04-03 14:07:56 +0000
@@ -77,7 +77,8 @@
         self.display_name = None
         self.location = None
 
-        discover(key)
+        if self.is_available():
+            discover(key)
 
     def get_field(self, field, default=None):
         (valid, value) = openpgp.GetKeyField(self.key, field)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWePtcRQAActfgCRQUWP//3//
/6C////wUAQ+l72BwKnRQYSiJGIaNTaNNSbJ6RtNU2pvUT9InpPUek2ZImyh6mOGmmRiMJpgIYBN
MIwTEyGmRoaAaVPRpNNNANBoNADCaNBpkaAAABtVPUJkg2nqmJ5TJ6ENNDR6gDQDCMg0yYSUCNAm
JmpoCaU/KeqZqbNU9Jh6kPU0Gh6T1HpKBQJYW46zN8+ihM/HVC39KFEYnM3UNqptUwh2puZmt9PP
Auq+I6brruI/Lyirv3G/hYdFexLZccRzQeIzUnrbb0VXIYeVbFYM4L6qLZ9mhqfwY+9cNu43G4su
ZBknM0Q+WSBSKvz+/t7BB71wWonKkK5G2zvLNukDCUXeW8Ssp6hwiwvnehkc1buFIo0Ss1VUPJ9M
A4DAKkBAn4HkgYiKMDxWQ4G20BpYlAlTTfkIlhNggdMmZhDAkY4QBkgPoZykomZMTXmJ04XlTWGK
onzpKm10LSo2DyYRlBx/wDzFChwLzElKDxtFbiY3Ip0VI0MSUzxEwwuC+/B48znhvdHQY90jnaS1
2YZ9AHAMjycoQrCdzMmFTgJtRWwhpWfkrWp48vpxHmpwGI9mqcPk8rM4w7D+qo0pJlBhfRaPJ/dJ
puHnpx0XIxNqeYaQlDW49aJwO9HS3hC12koCw2K4HyL0Q7TVzI1E1qcf65ZF+l5iwl9Rr3XtNPg2
wwdVjZBEx08Nmw7IB9VRV8yezn46mP2+iWHpu+a2t8Nqgh928eqTdFEftPRxK/GL32ZMMTEjIJ5d
P3zwV3x8iW8uinO1P0+ja5Z8/odkbwXV4/+Q+02nQZL3J/bNPhpRUFZr8JhiFJTVtoAjKsEFwzIQ
gNKhE3zeURTEP9WsRMe0vCUwJa5dNUSUKhWQ7mFUzXCYiREwc0roP28pBQNGE7vXt8ibKKMtGmSX
vkER6+4wRP3EucPhbA55joZOuMyyHhtHG4tR416AzK5ybWZ9JmOOI7qGLiMrJSM5y4wyD3dHOew9
jzC12ILKFMJQYUS6/jSZ8eRIeb0lTut71ETLJYRSUfPaDiggyhA0P5HZQ9pk4+uZpcYFxE8vVhtY
HIb3I9XJLzEqPP6vErst2gU7PC22A0iiUFUiytOnRYUmA4wIl/yrYqSWpQMutFnjjrdCgR7aupA+
/fw8Y8L/ZcBxNarQwSz2aUUAdhP1iTBKsGm9g6ziB3HCg6HX7BLI5iTlQEtthpjD0FvhNBJSKp3o
eysckuKItYnsD3ZLincknWgITdE8HTAK8KNLaKHySnaFY6q800wQIhTsmmGfIm5KHA5DQNetjF+t
aPsckocZhWekvtYnTzUBJt4OHsYMYbwGrQYPnGWbHZGwCQk/YfT4365MJYD2xUWCfWHai0eMIo7C
0bVRPI9H2wH+4ieTSy5TmbTWPIooE5gQpreIf1TBxGfPwAs4z11NVnbJBzReeuO9G/KUQxtJOYOc
xOsRsuJx8QPgXckU4UJDj7XEUA==

Attachment: signature.asc
Description: This is a digitally signed message part

-- 
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.canonical.com/mailman/listinfo/bzr-gtk

Reply via email to