Author: andar
Revision: 5296
Log:
Fix #943 exception when options is None
Diff:
Modified: trunk/deluge/core/daemon.py
===================================================================
--- trunk/deluge/core/daemon.py 2009-05-20 21:09:50 UTC (rev 5295)
+++ trunk/deluge/core/daemon.py 2009-05-20 21:39:02 UTC (rev 5296)
@@ -147,12 +147,12 @@
# Make sure we start the PreferencesManager first
component.start("PreferencesManager")
- # Write out a pid file all the time, we use this to see if a deluged
is running
- # We also include the running port number to do an additional test
- open(deluge.configmanager.get_config_dir("deluged.pid"), "wb").write(
- "%s;%s\n" % (os.getpid(), options.port if options.port else 58846))
+ if not classic:
+ # Write out a pid file all the time, we use this to see if a
deluged is running
+ # We also include the running port number to do an additional test
+ open(deluge.configmanager.get_config_dir("deluged.pid"),
"wb").write(
+ "%s;%s\n" % (os.getpid(), port))
- if not classic:
component.start()
try:
reactor.run()
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
