summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Buch <daniel.buch@gmail.com>2010-05-06 14:23:16 -0400
committerDan Buch <daniel.buch@gmail.com>2010-05-06 14:23:16 -0400
commit86f02e22e2e094c4751e32cf9ea4c636654638e9 (patch)
treeaf163b00f6d2aede8bdd109eb6d5ddfc608aee24
parentff7ae56725bcb8bc69ce3a7f2125c0abc57de587 (diff)
downloadhg_sshsign-86f02e22e2e094c4751e32cf9ea4c636654638e9.tar.bz2
hg_sshsign-86f02e22e2e094c4751e32cf9ea4c636654638e9.tar.xz
hg_sshsign-86f02e22e2e094c4751e32cf9ea4c636654638e9.zip
aborting when missing required hgrc entry
-rw-r--r--hgsshsign/__init__.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/hgsshsign/__init__.py b/hgsshsign/__init__.py
index a6991db..80c5d82 100644
--- a/hgsshsign/__init__.py
+++ b/hgsshsign/__init__.py
@@ -6,9 +6,8 @@ SSH Key Signing
6@organization: American Greetings Interactive 6@organization: American Greetings Interactive
7@date: May 03, 2010 7@date: May 03, 2010
8""" 8"""
9
10
11import os 9import os
10import sys
12import binascii 11import binascii
13 12
14from hgsshsign._meta import __version__ 13from hgsshsign._meta import __version__
@@ -26,7 +25,14 @@ class SSHAuthority(object):
26 import hgsshsign.keys as keys 25 import hgsshsign.keys as keys
27 from hgsshsign.keymanifest import KeyManifest 26 from hgsshsign.keymanifest import KeyManifest
28 27
29 public_key = absolute_path(ui.config("sshsign", "public_key")) 28 try:
29 public_key = absolute_path(ui.config("sshsign", "public_key"))
30
31 except TypeError:
32 raise util.Abort(
33 _("You must define sshsign.public_key in your hgrc")), \
34 None, sys.exc_info()[2]
35
30 public_key = keys.PublicKey.from_file(public_key) 36 public_key = keys.PublicKey.from_file(public_key)
31 37
32 manifest_file = ui.config("sshsign", "manifest_file") 38 manifest_file = ui.config("sshsign", "manifest_file")