freebsd fix oops
This commit is contained in:
parent
5175dbf72d
commit
0155df2d58
12
setup.py
12
setup.py
|
@ -36,12 +36,12 @@ if platform.system() == "Linux":
|
||||||
elif platform.system() == "Darwin" :
|
elif platform.system() == "Darwin" :
|
||||||
print "Darwin / OS X system detected"
|
print "Darwin / OS X system detected"
|
||||||
OS = "osx"
|
OS = "osx"
|
||||||
|
elif platform.system() == "FreeBSD" :
|
||||||
|
print "FreeBSD operating system detected"
|
||||||
|
OS = "freebsd"
|
||||||
elif platform.system() == "Windows":
|
elif platform.system() == "Windows":
|
||||||
print "Windows system detected"
|
print "Windows system detected"
|
||||||
OS = "win"
|
OS = "win"
|
||||||
elif platform.system() == "FreeBSD":
|
|
||||||
print "FreeBSD system detected"
|
|
||||||
OS = "freebsd"
|
|
||||||
elif os.name == "posix":
|
elif os.name == "posix":
|
||||||
print "Unix system detected"
|
print "Unix system detected"
|
||||||
OS = "nix"
|
OS = "nix"
|
||||||
|
@ -90,16 +90,15 @@ if ARCH == "x64":
|
||||||
# it has been removed to prevent confusion.
|
# it has been removed to prevent confusion.
|
||||||
|
|
||||||
if not OS == "win":
|
if not OS == "win":
|
||||||
|
|
||||||
if OS == "linux":
|
if OS == "linux":
|
||||||
if os.WEXITSTATUS(os.system('grep -q "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Fedora Core release 6" /etc/issue')) == 0:
|
if os.WEXITSTATUS(os.system('grep -q "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Fedora Core release 6" /etc/issue')) == 0:
|
||||||
boosttype = 'nomt'
|
boosttype = 'nomt'
|
||||||
|
else:
|
||||||
|
boosttype = 'mt'
|
||||||
elif OS == "freebsd":
|
elif OS == "freebsd":
|
||||||
boosttype = 'nomt'
|
boosttype = 'nomt'
|
||||||
else:
|
else:
|
||||||
boosttype = 'mt'
|
boosttype = 'mt'
|
||||||
|
|
||||||
|
|
||||||
removals = ['-g', '-DNDEBUG', '-O2', '-Wstrict-prototypes']
|
removals = ['-g', '-DNDEBUG', '-O2', '-Wstrict-prototypes']
|
||||||
additions = ['-DNDEBUG', '-O2']
|
additions = ['-DNDEBUG', '-O2']
|
||||||
|
|
||||||
|
@ -317,3 +316,4 @@ setup(name=NAME, fullname=FULLNAME, version=VERSION,
|
||||||
ext_modules=[deluge_core],
|
ext_modules=[deluge_core],
|
||||||
cmdclass=cmdclass
|
cmdclass=cmdclass
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -378,7 +378,7 @@ class DelugeGTK:
|
||||||
self.name_column = dgtk.add_text_column(self.torrent_view, _("Name"), 2)
|
self.name_column = dgtk.add_text_column(self.torrent_view, _("Name"), 2)
|
||||||
self.size_column = dgtk.add_func_column(self.torrent_view, _("Size"), size, 3)
|
self.size_column = dgtk.add_func_column(self.torrent_view, _("Size"), size, 3)
|
||||||
self.status_column = dgtk.add_progress_column(self.torrent_view, _("Status"), 4, 5)
|
self.status_column = dgtk.add_progress_column(self.torrent_view, _("Status"), 4, 5)
|
||||||
self.seed_column = dgtk.add_func_column(self.torrent_view, _("Seeders"), peer, (6, 7))
|
self.seed_column = dgtk.add_func_column(self.torrent_view, _("Seeders"), seed, (6, 7))
|
||||||
self.peer_column = dgtk.add_func_column(self.torrent_view, _("Peers"), peer, (8, 9))
|
self.peer_column = dgtk.add_func_column(self.torrent_view, _("Peers"), peer, (8, 9))
|
||||||
self.dl_column = dgtk.add_func_column(self.torrent_view, _("Download"), rate, 10)
|
self.dl_column = dgtk.add_func_column(self.torrent_view, _("Download"), rate, 10)
|
||||||
self.ul_column = dgtk.add_func_column(self.torrent_view, _("Upload"), rate, 11)
|
self.ul_column = dgtk.add_func_column(self.torrent_view, _("Upload"), rate, 11)
|
||||||
|
|
Loading…
Reference in New Issue