Use textwrap to wrap our lines to 80char, otherwise ircd cannot parse the long
comments we use (beeth is aware) git-svn-id: svn+ssh://svn.ipng.nl/usr/share/subversion/repositories/ircnet.ipng.ch@38 c5d60b8d-fdcb-4146-b734-af4215e9eb71
This commit is contained in:
@ -21,6 +21,7 @@ import os
|
|||||||
import getpass
|
import getpass
|
||||||
import socket
|
import socket
|
||||||
import re
|
import re
|
||||||
|
import textwrap
|
||||||
|
|
||||||
def usage():
|
def usage():
|
||||||
print """Usage:
|
print """Usage:
|
||||||
@ -169,18 +170,15 @@ def main():
|
|||||||
ofile.write("# File generated on %s by %s@%s\n" %
|
ofile.write("# File generated on %s by %s@%s\n" %
|
||||||
(time.asctime(time.localtime(time.time())),
|
(time.asctime(time.localtime(time.time())),
|
||||||
getpass.getuser(), socket.gethostname()))
|
getpass.getuser(), socket.gethostname()))
|
||||||
# TODO(pim): Make these lines wrap at ~80char because the ircd config
|
ofile.write("# Commandline:\n# %s\n" %
|
||||||
# parser cannot take long lines :(
|
("\n# ".join(textwrap.wrap(' '.join(sys.argv)))))
|
||||||
# ofile.write("# Commandline: %s\n" % ' '.join(sys.argv))
|
|
||||||
# ofile.write("# assets=%s asns=%s output=%s class=%s\n" %
|
|
||||||
# (','.join(_assets), ','.join(_asns), _output, _class))
|
|
||||||
|
|
||||||
ofile.write("# Objects found: %d route/route6, %d ASn, %d as-set\n\n" %
|
ofile.write("# Objects found: %d route/route6, %d ASn, %d as-set\n\n" %
|
||||||
(len(all_route_list), len(_data['asn']), len(_assets)))
|
(len(all_route_list), len(_data['asn']), len(_assets)))
|
||||||
|
|
||||||
# for _asset in _data['as-set']:
|
for _asset in _data['as-set']:
|
||||||
# ofile.write("# %s: %s\n" %
|
ofile.write("# %s:\n# %s\n" %
|
||||||
# (_asset, ', '.join(_data['as-set'][_asset])))
|
(_asset, "\n# ".join(textwrap.fill(
|
||||||
|
', '.join(_data['as-set'][_asset])))))
|
||||||
ofile.write("#\n\n")
|
ofile.write("#\n\n")
|
||||||
|
|
||||||
output_linecount = 0
|
output_linecount = 0
|
||||||
|
Reference in New Issue
Block a user