mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 07:20:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

nightly: use shutil.move() only so all ops work across filesystems

Browse source 
https://gitlab.com/fdroid/fdroidserver/merge_requests/377#note_49998712
This commit is contained in:
Hans-Christoph Steiner 2017-12-05 09:13:19 +01:00
parent 2983c35361
commit 4561ea59a6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/nightly.py
View file

@ -70,7 +70,7 @@ def _ssh_key_from_debug_keystore():
rsakey = paramiko.RSAKey.from_private_key_file(privkey) rsakey = paramiko.RSAKey.from_private_key_file(privkey)
fingerprint = base64.b64encode(hashlib.sha256(rsakey.asbytes()).digest()).decode('ascii').rstrip('=') fingerprint = base64.b64encode(hashlib.sha256(rsakey.asbytes()).digest()).decode('ascii').rstrip('=')
ssh_private_key_file = os.path.join(tmp_dir, 'debug_keystore_' + fingerprint + '_id_rsa') ssh_private_key_file = os.path.join(tmp_dir, 'debug_keystore_' + fingerprint + '_id_rsa')
os.rename(privkey, ssh_private_key_file) shutil.move(privkey, ssh_private_key_file)
pub = rsakey.get_name() + ' ' + rsakey.get_base64() + ' ' + ssh_private_key_file pub = rsakey.get_name() + ' ' + rsakey.get_base64() + ' ' + ssh_private_key_file
with open(ssh_private_key_file + '.pub', 'w') as fp: with open(ssh_private_key_file + '.pub', 'w') as fp:
@ -283,8 +283,8 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base,
os.makedirs(os.path.dirname(ssh_dir), exist_ok=True) os.makedirs(os.path.dirname(ssh_dir), exist_ok=True)
privkey = _ssh_key_from_debug_keystore() privkey = _ssh_key_from_debug_keystore()
ssh_private_key_file = os.path.join(ssh_dir, os.path.basename(privkey)) ssh_private_key_file = os.path.join(ssh_dir, os.path.basename(privkey))
os.rename(privkey, ssh_private_key_file) shutil.move(privkey, ssh_private_key_file)
os.rename(privkey + '.pub', ssh_private_key_file + '.pub') shutil.move(privkey + '.pub', ssh_private_key_file + '.pub')
if shutil.rmtree.avoids_symlink_attacks: if shutil.rmtree.avoids_symlink_attacks:
shutil.rmtree(os.path.dirname(privkey)) shutil.rmtree(os.path.dirname(privkey))