summaryrefslogtreecommitdiff
path: root/lib/leap_cli
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-10-23 12:09:31 -0700
committerelijah <elijah@riseup.net>2012-10-23 12:09:31 -0700
commit6f9eb8bb0d3ecb2acdb039c669a2e5b80ddf7ab8 (patch)
tree68c8612e9bb2662f2eb2033bd36d424483448b1d /lib/leap_cli
parent5fa7b15f726166771f743e2da94fc87da475cfee (diff)
fixed typo with read_file! and don't require pgp key for a user.
Diffstat (limited to 'lib/leap_cli')
-rw-r--r--lib/leap_cli/commands/user.rb2
-rw-r--r--lib/leap_cli/util.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/leap_cli/commands/user.rb b/lib/leap_cli/commands/user.rb
index 7be91c8..a7bf848 100644
--- a/lib/leap_cli/commands/user.rb
+++ b/lib/leap_cli/commands/user.rb
@@ -45,7 +45,7 @@ module LeapCli
end
assert!(ssh_pub_key, 'Sorry, could not find SSH public key.')
- assert!(pgp_pub_key, 'Sorry, could not find OpenPGP public key.')
+ #assert!(pgp_pub_key, 'Sorry, could not find OpenPGP public key.')
if ssh_pub_key
write_file!([:user_ssh, username], ssh_pub_key)
diff --git a/lib/leap_cli/util.rb b/lib/leap_cli/util.rb
index 53bad35..fdbdc8a 100644
--- a/lib/leap_cli/util.rb
+++ b/lib/leap_cli/util.rb
@@ -127,7 +127,7 @@ module LeapCli
def read_file!(filepath)
filepath = Path.named_path(filepath)
if !File.exists?(filepath)
- bail!("File '%s' does not exist." % exc.file_path)
+ bail!("File '%s' does not exist." % filepath)
else
File.read(filepath)
end