sshkeys_authority: don't allow to return None as parameter.

9e340a01 · Cédric de Saint Martin · 192031f0 · 9e340a01
Commit 9e340a01 authored Oct 04, 2013 by Cédric de Saint Martin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

slapos/recipe/sshkeys_authority.py slapos/recipe/sshkeys_authority.py +4 -4

No files found.
--- a/slapos/recipe/sshkeys_authority.py
+++ b/slapos/recipe/sshkeys_authority.py
@@ -113,11 +113,11 @@ class Request(GenericBaseRecipe):
      hashlib.sha256(options['name']).hexdigest())
    self.public_key = self.private_key + '.pub'
+    options['public-key-value'] = ''
    if os.path.exists(self.public_key):
-      with open(self.public_key) as key:
+      key_content = open(self.public_key).read()
-        options['public-key-value'] = key.read()
+      if key_content:
-    else:
+        options['public-key-value'] = key_content
-      options['public-key-value'] = ''
  def install(self):
    requests_directory = self.options['request-directory']