mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-22 10:09:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix: os.join created root path in Remove_Empty_Folder if variable 'folder' had a leading slash

Browse source
This commit is contained in:
Calum Lind 2011-02-14 00:18:45 +00:00
commit 1e0005f572
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
deluge/core/torrentmanager.py
View file

@ -42,6 +42,7 @@ import time
import shutil
import operator
import logging
import re
from twisted.internet import reactor
from twisted.internet.task import LoopingCall
@ -757,7 +758,9 @@ class TorrentManager(component.Component):
raise InvalidTorrentError("torrent_id is not in session")
info = self.torrents[torrent_id].get_status(['save_path'])
folder_full_path = os.path.join(info['save_path'], folder)
# Regex removes leading slashes that causes join function to ignore save_path
folder_full_path = os.path.join(info['save_path'], re.sub("^/*", "", folder))
folder_full_path = os.path.normpath(folder_full_path)
try:
if not os.listdir(folder_full_path):