summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2010-08-15 14:43:18 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2010-08-15 14:43:18 +0200
commit03eecc372628391815f9b0091a0bd980c146685d (patch)
tree7c3ccb195668905cae8a668f8d90eb19bc8f8ea6
parentfix (diff)
downloadpyload-03eecc372628391815f9b0091a0bd980c146685d.tar.xz
some fixes, fixed #125
-rw-r--r--module/PluginThread.py4
-rw-r--r--module/ThreadManager.py2
-rw-r--r--module/plugins/container/DLC_25.pycbin8193 -> 8211 bytes
-rw-r--r--module/plugins/container/DLC_26.pycbin8166 -> 8184 bytes
-rw-r--r--module/setup.py4
-rwxr-xr-xpyLoadCore.py2
6 files changed, 6 insertions, 6 deletions
diff --git a/module/PluginThread.py b/module/PluginThread.py
index 50aa7c2c8..eb2b568d8 100644
--- a/module/PluginThread.py
+++ b/module/PluginThread.py
@@ -185,9 +185,9 @@ class DownloadThread(PluginThread):
if self.m.core.debug:
print "pycurl error", code, msg
print_exc()
- self.writeDebugReport()
+ self.writeDebugReport(pyfile)
- if code == 7:
+ if code in (7,52):
self.m.log.warning(_("Couldn't connect to host waiting 1 minute and retry."))
sleep(60)
self.queue.put(pyfile)
diff --git a/module/ThreadManager.py b/module/ThreadManager.py
index c660ed3e4..b9c407484 100644
--- a/module/ThreadManager.py
+++ b/module/ThreadManager.py
@@ -180,7 +180,7 @@ class ThreadManager:
thread.put(job)
else:
#put job back
- if not self.core.files.jobCache.has_key(occ)
+ if not self.core.files.jobCache.has_key(occ):
self.core.files.jobCache[occ] = []
self.core.files.jobCache[occ].append(job.id)
diff --git a/module/plugins/container/DLC_25.pyc b/module/plugins/container/DLC_25.pyc
index 512ceda08..92c9e41ef 100644
--- a/module/plugins/container/DLC_25.pyc
+++ b/module/plugins/container/DLC_25.pyc
Binary files differ
diff --git a/module/plugins/container/DLC_26.pyc b/module/plugins/container/DLC_26.pyc
index 60378b5a8..1d38fa1d9 100644
--- a/module/plugins/container/DLC_26.pyc
+++ b/module/plugins/container/DLC_26.pyc
Binary files differ
diff --git a/module/setup.py b/module/setup.py
index ac2bb57c2..95533e698 100644
--- a/module/setup.py
+++ b/module/setup.py
@@ -270,10 +270,10 @@ class Setup():
print ""
- call(["python", join(self.path, "module", "web", "manage.py"), "syncdb", "--noinput"])
+ call(["python", join(self.path, "module", "web", "manage.py"), "syncdb", "--noinput", "--settings=module.web.settings"])
print _("If you see no errors, your db should be fine and we're adding an user now.")
username = self.ask(_("Username"), "User")
- call(['python', join(self.path, "module", "web", "manage.py"), 'createsuperuser', '--email=email@trash-mail.com', '--username=%s' % username, '--noinput'])
+ call(['python', join(self.path, "module", "web", "manage.py"), 'createsuperuser', '--email=email@trash-mail.com', '--username=%s' % username, '--noinput', "--settings=module.web.settings"])
password = self.ask("", "", password=True)
salt = reduce(lambda x, y: x + y, [str(random.randint(0, 9)) for i in range(0, 5)])
diff --git a/pyLoadCore.py b/pyLoadCore.py
index 75b622ce8..fe7ba861f 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -74,7 +74,7 @@ class Core(object):
if len(argv) > 1:
try:
- options, args = getopt(argv[1:], 'vca:hdus:', ["version", "clear", "add=", "help", "debug", "user", "setup", "configdir="])
+ options, args = getopt(argv[1:], 'vca:hdus', ["version", "clear", "add=", "help", "debug", "user", "setup", "configdir="])
for option, argument in options:
if option in ("-v", "--version"):