Merge branch 'serge'

2018-02-24 21:07:42 +02:00
parent f4208009e0 b20d98bf57
commit 4a9140c42d
2 changed files with 22 additions and 5 deletions
--- a/libagent/gpg/init.py
+++ b/libagent/gpg/init.py
@@ -126,7 +126,11 @@ def run_init(device_type, args):
    homedir = os.path.expanduser('~/.gnupg/{}'.format(device_name))
    log.info('GPG home directory: %s', homedir)

-    check_call(['rm', '-rf', homedir])
+    if os.path.exists(homedir):
+        log.error('GPG home directory %s exists, '
+                  'remove it manually if required', homedir)
+        sys.exit(1)
+
    check_call(['mkdir', '-p', homedir])
    check_call(['chmod', '700', homedir])