Author: zmedico
Date: 2008-12-09 07:52:36 +0000 (Tue, 09 Dec 2008)
New Revision: 12184
Modified:
main/trunk/bin/dispatch-conf
Log:
For py3k compat, avoid using list.sort(cmp).
Modified: main/trunk/bin/dispatch-conf
===================================================================
--- main/trunk/bin/dispatch-conf 2008-12-09 04:57:01 UTC (rev 12183)
+++ main/trunk/bin/dispatch-conf 2008-12-09 07:52:36 UTC (rev 12184)
@@ -326,25 +326,29 @@
We keep ._cfg0002_conf over ._cfg0001_conf and ._cfg0000_conf.
"""
h = {}
-
+ configs = []
newconfigs.sort ()
for nconf in newconfigs:
nconf = nconf.rstrip ()
conf = re.sub (r'\._cfg\d+_', '', nconf)
- dir = re.match (r'^(.+)/', nconf).group (1)
+ dirname = os.path.dirname(nconf)
+ conf_map = {
+ 'current' : conf,
+ 'dir' : dirname,
+ 'new' : nconf,
+ }
if conf in h:
mrgconf = re.sub(r'\._cfg', '._mrg', h[conf]['new'])
if os.path.exists(mrgconf):
os.unlink(mrgconf)
os.unlink(h[conf]['new'])
+ h[conf].update(conf_map)
+ else:
+ h[conf] = conf_map
+ configs.append(conf_map)
- h [conf] = { 'current' : conf, 'dir' : dir, 'new' : nconf }
-
- configs = h.values ()
- configs.sort (lambda a, b: cmp(a ['current'], b ['current']))
-
return configs
|
