mirror
/
mylar
mirror of https://github.com/evilhero/mylar
1
0
Fork 0
Code Issues Releases Wiki Activity

FIX: fix for keyfile usage with auto-snatch using correct information

This commit is contained in:
evilhero 2017-11-13 11:53:16 -05:00
parent e02a5d01f6
commit 7c171a7e8f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mylar/helpers.py
View File

@ -2747,10 +2747,17 @@ def torrentinfo(issueid=None, torrent_hash=None, download=False, monitor=False):
os.environ['host'] = mylar.CONFIG.PP_SSHHOST os.environ['host'] = mylar.CONFIG.PP_SSHHOST
os.environ['port'] = mylar.CONFIG.PP_SSHPORT os.environ['port'] = mylar.CONFIG.PP_SSHPORT
os.environ['user'] = mylar.CONFIG.PP_SSHUSER os.environ['user'] = mylar.CONFIG.PP_SSHUSER
os.environ['passwd'] = mylar.CONFIG.PP_SSHPASSWD
os.environ['localcd'] = mylar.CONFIG.PP_SSHLOCALCD os.environ['localcd'] = mylar.CONFIG.PP_SSHLOCALCD
#bash won't accept None, so send check and send empty strings for the 2 possible None values if needed
if mylar.CONFIG.PP_SSHKEYFILE is not None: if mylar.CONFIG.PP_SSHKEYFILE is not None:
os.environ['keyfile'] = mylar.CONFIG.PP_SSHKEYFILE os.environ['keyfile'] = mylar.CONFIG.PP_SSHKEYFILE
else:
os.environ['keyfile'] = ''
if mylar.CONFIG.PP_SSHPASSWD is not None:
os.environ['passwd'] = mylar.CONFIG.PP_SSHPASSWD
else:
os.environ['passwd'] = ''
#downlocation = re.sub("\'", "\\'", downlocation) #downlocation = re.sub("\'", "\\'", downlocation)
#downlocation = re.sub("&", "\&", downlocation) #downlocation = re.sub("&", "\&", downlocation)