mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-26 20:59:27 +01:00
scripts/supybot: Unify the `os.linesep' vs '\n' usage.
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
This commit is contained in:
parent
a693162059
commit
2242b26025
@ -45,7 +45,8 @@ import signal
|
|||||||
import cStringIO as StringIO
|
import cStringIO as StringIO
|
||||||
|
|
||||||
if sys.version_info < (2, 3, 0):
|
if sys.version_info < (2, 3, 0):
|
||||||
sys.stderr.write('This program requires Python >= 2.3.0\n')
|
sys.stderr.write('This program requires Python >= 2.3.0')
|
||||||
|
sys.stderr.write(os.linesep)
|
||||||
sys.exit(-1)
|
sys.exit(-1)
|
||||||
|
|
||||||
def _termHandler(signalNumber, stackFrame):
|
def _termHandler(signalNumber, stackFrame):
|
||||||
@ -171,7 +172,8 @@ if __name__ == '__main__':
|
|||||||
|
|
||||||
if os.name == 'posix':
|
if os.name == 'posix':
|
||||||
if (os.getuid() == 0 or os.geteuid() == 0) and not options.allowRoot:
|
if (os.getuid() == 0 or os.geteuid() == 0) and not options.allowRoot:
|
||||||
sys.stderr.write('Dude, don\'t even try to run this as root.\n')
|
sys.stderr.write('Dude, don\'t even try to run this as root.')
|
||||||
|
sys.stderr.write(os.linesep)
|
||||||
sys.exit(-1)
|
sys.exit(-1)
|
||||||
|
|
||||||
if len(args) > 1:
|
if len(args) > 1:
|
||||||
@ -208,9 +210,10 @@ if __name__ == '__main__':
|
|||||||
errmsg = textwrap.fill('%s: %s' % (name, e),
|
errmsg = textwrap.fill('%s: %s' % (name, e),
|
||||||
width=78, subsequent_indent=' '*len(name))
|
width=78, subsequent_indent=' '*len(name))
|
||||||
sys.stderr.write(errmsg)
|
sys.stderr.write(errmsg)
|
||||||
sys.stderr.write('\n')
|
sys.stderr.write(os.linesep)
|
||||||
sys.stderr.write('Please fix this error in your configuration file '
|
sys.stderr.write('Please fix this error in your configuration file '
|
||||||
'and restart your bot.\n')
|
'and restart your bot.')
|
||||||
|
sys.stderr.write(os.linesep)
|
||||||
sys.exit(-1)
|
sys.exit(-1)
|
||||||
import supybot.conf as conf
|
import supybot.conf as conf
|
||||||
import supybot.world as world
|
import supybot.world as world
|
||||||
@ -292,7 +295,7 @@ if __name__ == '__main__':
|
|||||||
try:
|
try:
|
||||||
fd = file(pidFile, 'w')
|
fd = file(pidFile, 'w')
|
||||||
pid = os.getpid()
|
pid = os.getpid()
|
||||||
fd.write('%s\n' % pid)
|
fd.write('%s%s' % (pid, os.linesep))
|
||||||
fd.close()
|
fd.close()
|
||||||
def removePidFile():
|
def removePidFile():
|
||||||
try:
|
try:
|
||||||
|
Loading…
Reference in New Issue
Block a user