From e2d2a72bd2877271546473c6d670a1be6353ab54 Mon Sep 17 00:00:00 2001 From: caremoli Date: Thu, 3 Feb 2011 17:22:37 +0000 Subject: [PATCH] CCAR: remove gui="no" option for module without gui (buggy) --- module_generator/gener.py | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/module_generator/gener.py b/module_generator/gener.py index bb1eb00..f51acf8 100644 --- a/module_generator/gener.py +++ b/module_generator/gener.py @@ -886,17 +886,11 @@ echo " Qt ..................... : $qt_ok" for cata in lcata: catadir, catafile = os.path.split(cata) name = catafile[:-11] - if name == "GUI": - modules_dict[name] = ' ' % (name, path) - else: - modules_dict[name] = ' ' % (name, path) + modules_dict[name] = ' ' % (name, path) else: - if module == "GUI": - modules_dict[module] = ' ' % (module, path) - else: - modules_dict[module] = ' ' % (module, path) + modules_dict[module] = ' ' % (module, path) - modules_dict["KERNEL"] = ' ' % self.kernel + modules_dict["KERNEL"] = ' ' % self.kernel #keep only the modules which names are in restrict if given modules = [] @@ -910,16 +904,10 @@ echo " Qt ..................... : $qt_ok" #add the alternate modules if given if altmodules: for module, path in altmodules.items(): - if module == "GUI": - modules.append(' ' % (module, path)) - else: - modules.append(' ' % (module, path)) + modules.append(' ' % (module, path)) #add the generated module - if self.gui: - modules.append(' ' % (self.module.name, os.path.abspath(self.module.prefix))) - else: - modules.append(' ' % (self.module.name, os.path.abspath(self.module.prefix))) + modules.append(' ' % (self.module.name, os.path.abspath(self.module.prefix))) #try to find a prerequisites file -- 2.39.2