diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-12-12 21:24:53 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-12-12 21:24:53 +0000 |
| commit | e1474e8f318b5a699a4cf9516387ae198ac5ebb0 (patch) | |
| tree | bd29cc59aacdaf7f900f771e6e0f06e966e4a0e8 /bin/dispatch-conf | |
| parent | For py3k compat, remove Package.__cmp__() and related cmp() function call. (diff) | |
| download | portage-multirepo-e1474e8f318b5a699a4cf9516387ae198ac5ebb0.tar.gz portage-multirepo-e1474e8f318b5a699a4cf9516387ae198ac5ebb0.tar.bz2 portage-multirepo-e1474e8f318b5a699a4cf9516387ae198ac5ebb0.zip | |
For py3k compat, avoid using list.sort(cmp). (trunk r12184)
svn path=/main/branches/2.1.6/; revision=12219
Diffstat (limited to 'bin/dispatch-conf')
| -rwxr-xr-x | bin/dispatch-conf | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 4f2fc09b..0b96ee54 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -326,24 +326,28 @@ class dispatch: 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] = { 'current' : conf, 'dir' : dir, 'new' : nconf } - - configs = h.values () - configs.sort (lambda a, b: cmp(a ['current'], b ['current'])) + h[conf].update(conf_map) + else: + h[conf] = conf_map + configs.append(conf_map) return configs |