Salome HOME
projects
/
tools
/
sat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix the generate command
[tools/sat.git]
/
commands
/
config.py
diff --git
a/commands/config.py
b/commands/config.py
index 02d0cc51ee82d37815ea3f03c42a36480e696326..0f3777cc284b37a6760623fdbe1aa2ce2e685692 100644
(file)
--- a/
commands/config.py
+++ b/
commands/config.py
@@
-98,6
+98,7
@@
class ConfigManager:
var['salometoolsway'] = os.path.dirname(
os.path.dirname(os.path.abspath(__file__)))
var['srcDir'] = os.path.join(var['salometoolsway'], 'src')
var['salometoolsway'] = os.path.dirname(
os.path.dirname(os.path.abspath(__file__)))
var['srcDir'] = os.path.join(var['salometoolsway'], 'src')
+ var['internal_dir'] = os.path.join(var['srcDir'], 'internal_config')
var['sep']= os.path.sep
# datadir has a default location
var['sep']= os.path.sep
# datadir has a default location
@@
-247,7
+248,8
@@
class ConfigManager:
src.pyconf.streamOpener = ConfigOpener([cfg.VARS.datadir])
try:
site_cfg = src.pyconf.Config(open(os.path.join(cfg.VARS.datadir,
src.pyconf.streamOpener = ConfigOpener([cfg.VARS.datadir])
try:
site_cfg = src.pyconf.Config(open(os.path.join(cfg.VARS.datadir,
- 'site.pyconf')))
+ 'site.pyconf')),
+ PWD = ('SITE', cfg.VARS.datadir) )
except src.pyconf.ConfigError as e:
raise src.SatException(_("Error in configuration file: "
"site.pyconf\n %(error)s") % \
except src.pyconf.ConfigError as e:
raise src.SatException(_("Error in configuration file: "
"site.pyconf\n %(error)s") % \
@@
-261,7
+263,6
@@
class ConfigManager:
+ cfg.VARS.sep
+ "site.pyconf and edit the file")
raise src.SatException( e );
+ cfg.VARS.sep
+ "site.pyconf and edit the file")
raise src.SatException( e );
-
merger.merge(cfg, site_cfg)
# apply overwrite from command line if needed
merger.merge(cfg, site_cfg)
# apply overwrite from command line if needed
@@
-287,7
+288,9
@@
class ConfigManager:
project_name = os.path.basename(
project_pyconf_path)[:-len(".pyconf")]
try:
project_name = os.path.basename(
project_pyconf_path)[:-len(".pyconf")]
try:
- project_cfg = src.pyconf.Config(open(project_pyconf_path))
+ project_pyconf_dir = os.path.dirname(project_pyconf_path)
+ project_cfg = src.pyconf.Config(open(project_pyconf_path),
+ PWD=("", project_pyconf_dir))
except Exception as e:
raise src.SatException(_("Error in configuration file: "
"%(file_path)s\n %(error)s") % \
except Exception as e:
raise src.SatException(_("Error in configuration file: "
"%(file_path)s\n %(error)s") % \
@@
-354,7
+357,8
@@
class ConfigManager:
try:
prod_cfg = src.pyconf.Config(open(
os.path.join(products_dir,
try:
prod_cfg = src.pyconf.Config(open(
os.path.join(products_dir,
- fName)))
+ fName)),
+ PWD=("", products_dir))
except src.pyconf.ConfigError as e:
raise src.SatException(_(
"Error in configuration file: %(prod)s\n %(error)s") % \
except src.pyconf.ConfigError as e:
raise src.SatException(_(
"Error in configuration file: %(prod)s\n %(error)s") % \
@@
-784,6
+788,7
@@
def run(args, runner, logger):
if 'APPLICATION' not in runner.cfg: # edit user pyconf
usercfg = os.path.join(runner.cfg.VARS.personalDir,
'salomeTools.pyconf')
if 'APPLICATION' not in runner.cfg: # edit user pyconf
usercfg = os.path.join(runner.cfg.VARS.personalDir,
'salomeTools.pyconf')
+ logger.write(_("Openning %s\n" % usercfg), 3)
src.system.show_in_editor(editor, usercfg, logger)
else:
# search for file <application>.pyconf and open it
src.system.show_in_editor(editor, usercfg, logger)
else:
# search for file <application>.pyconf and open it
@@
-791,6
+796,7
@@
def run(args, runner, logger):
pyconf_path = os.path.join(path,
runner.cfg.VARS.application + ".pyconf")
if os.path.exists(pyconf_path):
pyconf_path = os.path.join(path,
runner.cfg.VARS.application + ".pyconf")
if os.path.exists(pyconf_path):
+ logger.write(_("Openning %s\n" % pyconf_path), 3)
src.system.show_in_editor(editor, pyconf_path, logger)
break
src.system.show_in_editor(editor, pyconf_path, logger)
break