slaprunner: createNewUser doesn't depend on slapos to create a htpasswd file

3d28f5b5 · Nicolas Wavrant · 92680783 · 3d28f5b5
Commit 3d28f5b5 authored Aug 08, 2016 by Nicolas Wavrant
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

slapos/runner/utils.py slapos/runner/utils.py +5 -4

No files found.
--- a/slapos/runner/utils.py
+++ b/slapos/runner/utils.py
@@ -111,12 +111,13 @@ def getUsernameList(config):
 def createNewUser(config, name, passwd):
  htpasswdfile = os.path.join(config['etc_dir'], '.htpasswd')
-  if os.path.exists(htpasswdfile):
+  try:
-    htpasswd = HtpasswdFile(htpasswdfile)
+    htpasswd = HtpasswdFile(htpasswdfile, new=(not os.path.exists(htpasswdfile)))
    htpasswd.set_password(name, passwd)
    htpasswd.save()
-    return True
+  except IOError:
-  return False
+    return False
+  return True
 def getCurrentSoftwareReleaseProfile(config):
  """