Allowed datadir giving false positive. fix #3399

This commit is contained in:
Ruud
2014-06-08 11:57:53 +02:00
parent a2b3677c59
commit cfc49e286b
+2 -2
View File
@@ -8,7 +8,7 @@ import webbrowser
from couchpotato.api import addApiView from couchpotato.api import addApiView
from couchpotato.core.event import fireEvent, addEvent from couchpotato.core.event import fireEvent, addEvent
from couchpotato.core.helpers.variable import cleanHost, md5 from couchpotato.core.helpers.variable import cleanHost, md5, isSubFolder
from couchpotato.core.logger import CPLog from couchpotato.core.logger import CPLog
from couchpotato.core.plugins.base import Plugin from couchpotato.core.plugins.base import Plugin
from couchpotato.environment import Env from couchpotato.environment import Env
@@ -71,7 +71,7 @@ class Core(Plugin):
return value if value and len(value) > 3 else uuid4().hex return value if value and len(value) > 3 else uuid4().hex
def checkDataDir(self): def checkDataDir(self):
if Env.get('app_dir') in Env.get('data_dir'): if isSubFolder(Env.get('data_dir'), Env.get('app_dir')):
log.error('You should NOT use your CouchPotato directory to save your settings in. Files will get overwritten or be deleted.') log.error('You should NOT use your CouchPotato directory to save your settings in. Files will get overwritten or be deleted.')
return True return True