Navigation

Changeset 8

Timestamp:

09/06/07 14:05:03 (3 years ago)

Author:

tal

Message:

Handle overlapping directories found in multiple script directories.

Files:

r7	r8
67	67	if isinstance(path, list):
68	68	for p in path:
69		sections.update(runScriptDirectory(p))
	69	for section, scripts in runScriptDirectory(p).items():
	70	if section not in sections:
	71	sections[section] = {}
	72	sections[section].update(scripts)
70	73	else:
71	74	for fileName in os.listdir(path):
…	…
74	77	fullPath = os.path.join(path, fileName)
75	78	if os.path.isdir(fullPath):
76		sections[fileName] = runSubDirectory(fullPath)
	79	found = runSubDirectory(fullPath)
	80	if fileName in sections:
	81	sections[fileName].extend(found)
	82	else:
	83	sections[fileName] = found
77	84	return sections
78	85