From bf945a3062e7e4ab78f389977e03d72ae44be228 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 14 Sep 2022 22:51:31 +0200 Subject: [PATCH] nightly: only write SSH key files if ~/.ssh exists on dev's machine --- fdroidserver/nightly.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fdroidserver/nightly.py b/fdroidserver/nightly.py index 4d0d80ad..bfeca16f 100644 --- a/fdroidserver/nightly.py +++ b/fdroidserver/nightly.py @@ -430,11 +430,11 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base, + '\n -dname "CN=Android Debug,O=Android,C=US"') sys.exit(1) ssh_dir = os.path.join(os.getenv('HOME'), '.ssh') - os.makedirs(os.path.dirname(ssh_dir), exist_ok=True) privkey = _ssh_key_from_debug_keystore(options.keystore) - ssh_private_key_file = os.path.join(ssh_dir, os.path.basename(privkey)) - shutil.move(privkey, ssh_private_key_file) - shutil.move(privkey + '.pub', ssh_private_key_file + '.pub') + if os.path.exists(ssh_dir): + ssh_private_key_file = os.path.join(ssh_dir, os.path.basename(privkey)) + shutil.move(privkey, ssh_private_key_file) + shutil.move(privkey + '.pub', ssh_private_key_file + '.pub') if shutil.rmtree.avoids_symlink_attacks: shutil.rmtree(os.path.dirname(privkey))