codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-02-18 14:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1944 : Use errno constants for portability

Browse Source
This commit is contained in:
Cristian Greco 2011-11-20 15:27:17 +00:00 committed by Calum Lind
parent 3dcfa5cfd8
commit b2eb5aeb8c
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deluge/core/torrentmanager.py
View File

@ -848,7 +848,8 @@ class TorrentManager(component.Component):
os.removedirs(os.path.join(root, name)) os.removedirs(os.path.join(root, name))
log.debug("Removed Empty Folder %s", os.path.join(root, name)) log.debug("Removed Empty Folder %s", os.path.join(root, name))
except OSError as (errno, strerror): except OSError as (errno, strerror):
if errno == 39: from errno import ENOTEMPTY
if errno == ENOTEMPTY:
# Error raised if folder is not empty # Error raised if folder is not empty
log.debug("%s", strerror) log.debug("%s", strerror)

3
deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py
View File

@ -268,7 +268,8 @@ class Core(CorePluginBase):
try: try:
os.rename(filepath, copy_torrent_file) os.rename(filepath, copy_torrent_file)
except OSError, why: except OSError, why:
if why.errno == 18: from errno import EXDEV
if why.errno == errno.EXDEV:
# This can happen for different mount points # This can happen for different mount points
from shutil import copyfile from shutil import copyfile
try: try:

9
deluge/ui/gtkui/connectionmanager.py
View File

@ -17,9 +17,9 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with deluge. If not, write to: # along with deluge. If not, write to:
# The Free Software Foundation, Inc., # The Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor # 51 Franklin Street, Fifth Floor
# Boston, MA 02110-1301, USA. # Boston, MA 02110-1301, USA.
# #
# In addition, as a special exception, the copyright holders give # In addition, as a special exception, the copyright holders give
# permission to link the code of portions of this program with the OpenSSL # permission to link the code of portions of this program with the OpenSSL
@ -475,7 +475,8 @@ class ConnectionManager(component.Component):
try: try:
return client.start_daemon(port, config) return client.start_daemon(port, config)
except OSError, e: except OSError, e:
if e.errno == 2: from errno import ENOENT
if e.errno == ENOENT:
dialogs.ErrorDialog( dialogs.ErrorDialog(
_("Unable to start daemon!"), _("Unable to start daemon!"),
_("Deluge cannot find the 'deluged' executable, it is " _("Deluge cannot find the 'deluged' executable, it is "