From 6b218437c884945561c8fb9b9a78deb28d87901c Mon Sep 17 00:00:00 2001 From: Will Woods Date: Mon, 27 Jun 2011 15:18:16 -0400 Subject: [PATCH] generate_module_info fixup: "join" should be "joindir" --- src/pylorax/treebuilder.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index 2e8b6b05..72ce0be8 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -69,7 +69,7 @@ def generate_module_info(moddir, outfile=None): def module_desc(mod): return check_output(["modinfo", "-F", "description", mod]).strip() def read_module_set(name): - return set(l.strip() for l in open(join(moddir,name)) if ".ko" in l) + return set(l.strip() for l in open(joinpaths(moddir,name)) if ".ko" in l) modsets = {'scsi':read_module_set("modules.block"), 'eth':read_module_set("modules.networking")} @@ -78,10 +78,10 @@ def generate_module_info(moddir, outfile=None): for modtype, modset in modsets.items(): for mod in modset.intersection(files): # modules in this dir (name, ext) = os.path.splitext(mod) # foo.ko -> (foo, .ko) - desc = module_desc(join(root,mod)) or "%s driver" % name + desc = module_desc(joinpaths(root,mod)) or "%s driver" % name modinfo.append(dict(name=name, type=modtype, desc=desc)) - out = open(outfile or join(moddir,"module-info"), "w") + out = open(outfile or joinpaths(moddir,"module-info"), "w") logger.info("writing %s", out.name) for mod in sorted(modinfo, key=lambda m: m.get('name')): out.write('{name}\n\t{type}\n\t"{desc:.65}"\n'.format(**mod))