diff options
| -rw-r--r-- | src/lib/Options.py | 2 | ||||
| -rwxr-xr-x | src/lib/Server/Reports/importscript.py | 2 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-info | 9 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-server | 2 | ||||
| -rwxr-xr-x | tools/pkgmgr_gen.py | 7 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/Options.py b/src/lib/Options.py index fd31fa05b..dd9557521 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -1,5 +1,5 @@ '''Option parsing library for utilities''' -__revision__ = '$Revision: 5000 $' +__revision__ = '$Revision$' import getopt, os, socket, sys, ConfigParser, Bcfg2.Client.Tools diff --git a/src/lib/Server/Reports/importscript.py b/src/lib/Server/Reports/importscript.py index bb26647f2..174f7f639 100755 --- a/src/lib/Server/Reports/importscript.py +++ b/src/lib/Server/Reports/importscript.py @@ -1,6 +1,6 @@ #! /usr/bin/env python '''Imports statistics.xml and clients.xml files in to database backend for new statistics engine''' -__revision__ = '$Revision: 4999 $' +__revision__ = '$Revision$' import os, sys, binascii try: diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index cf369bd4d..bd04b599a 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -1,8 +1,8 @@ #!/usr/bin/python -i '''This tool loads the Bcfg2 core into an interactive debugger''' -__revision__ = '$Revision: 5014 $' +__revision__ = '$Revision$' -import copy, logging, lxml.etree, sys, time, cmd +import copy, logging, lxml.etree, sys, cmd import Bcfg2.Logger, Bcfg2.Server.Core, os import Bcfg2.Server.Plugins.Metadata, Bcfg2.Server.Plugin import Bcfg2.Options @@ -14,7 +14,8 @@ class dummyError(Exception): def printTabular(rows): '''print data in tabular format''' - cmax = tuple([max([len(str(row[index])) for row in rows]) + 1 for index in xrange(len(rows[0]))]) + cmax = tuple([max([len(str(row[index])) for row in rows]) + 1 \ + for index in xrange(len(rows[0]))]) fstring = (" %%-%ss |" * len(cmax)) % cmax fstring = ('|'.join([" %%-%ss "] * len(cmax))) % cmax print fstring % rows[0] @@ -282,7 +283,7 @@ Usage: [quit|exit]""" [cand.remove(c) for c in cand[:] if getattr(c.specific, field)] if len(cand) != 1: - print >>sys.stderr, "Entry %s failed" % cfile.get('name') + sys.stderr.write("Entry %s failed" % cfile.get('name')) continue print cand[0].name diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 48619c124..0c1c5d01c 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -1,7 +1,7 @@ #!/usr/bin/env python '''The XML-RPC Bcfg2 Server''' -__revision__ = '$Revision: 5014 $' +__revision__ = '$Revision$' import Bcfg2.Server.Plugins.Metadata diff --git a/tools/pkgmgr_gen.py b/tools/pkgmgr_gen.py index 4a725e51b..8e8fd7629 100755 --- a/tools/pkgmgr_gen.py +++ b/tools/pkgmgr_gen.py @@ -19,7 +19,6 @@ import datetime import glob import urllib import gzip -import time import urlparse from elementtree.ElementTree import parse @@ -75,7 +74,7 @@ def cmpRpmHeader(a, b): ret = cmp(n1, n2) if ret == 0: - ret = rpm.labelCompare((e1, v1, r1),(e2, v2, r2)) + ret = rpm.labelCompare((e1, v1, r1), (e2, v2, r2)) return ret def loadRpms(dirs): @@ -291,7 +290,7 @@ def printPackage(entry, group_count): if len(arch_dict[arch]) > 1: arch_dict[arch].sort() for s in arch_dict[arch][:-1]: - del subarch_dict[s] + del subarch_dict[s] # Sort packages within each architecture into version order for arch in subarch_dict: @@ -465,7 +464,7 @@ if __name__ == "__main__": # Set up list of architectures to include and some mappings # to use later. - arch_mapping = {'x86':['i686','i586','i486','i386','athlon'], + arch_mapping = {'x86':['i686', 'i586', 'i486', 'i386', 'athlon'], 'x86_64':['x86_64'], 'ia64':['ia64'], 'ppc':['ppc'], |