Merge branch 'downloaders_test' into downloaders_test_dev

Conflicts:
	couchpotato/core/downloaders/transmission/main.py
This commit is contained in:
mikke89 committed 2014-01-26 18:37:18 +01:00
commit 660e20dada
1 file changed
+1 -1
@@ -20,7 +20,7 @@ class Transmission(Downloader):
trpc = None trpc = None
testable = True testable = True
def connect(self, reconnect = True): def connect(self, reconnect = False):
# Load host from config and split out port. # Load host from config and split out port.
host = cleanHost(self.conf('host'), protocol = False).split(':') host = cleanHost(self.conf('host'), protocol = False).split(':')
if not isInt(host[1]): if not isInt(host[1]):