Changeset cb9640f in sasview for src/sas/_config.py
- Timestamp:
- Dec 17, 2018 7:15:53 AM (5 years ago)
- Branches:
- master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249
- Children:
- dcd6efd
- Parents:
- 33d3a74 (diff), 93b34cc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - git-author:
- Wojciech Potrzebowski <Wojciech.Potrzebowski@…> (12/17/18 07:15:53)
- git-committer:
- GitHub <noreply@…> (12/17/18 07:15:53)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/_config.py
rb963b20 r93b34cc 86 86 def setup_custom_config(app_dir, user_dir): 87 87 path = make_custom_config_path(user_dir) 88 #logger.info("custom config path %s", path) 88 89 if not os.path.isfile(path): 89 90 try: … … 94 95 logger.error("Could not copy default custom config.") 95 96 97 custom_config = load_custom_config(path) 98 96 99 #Adding SAS_OPENCL if it doesn't exist in the config file 97 100 # - to support backcompability 98 if not "SAS_OPENCL" in open(path).read(): 101 if not hasattr(custom_config, "SAS_OPENCL"): 102 custom_config.SAS_OPENCL = None 99 103 try: 100 open( config_file, "a+").write("SAS_OPENCL = \"None\"\n")104 open(path, "a+").write("SAS_OPENCL = \"None\"\n") 101 105 except Exception: 102 106 logger.error("Could not update custom config with SAS_OPENCL.") 103 107 104 custom_config = load_custom_config(path)105 108 return custom_config 106 107 109 108 110 def load_custom_config(path):
Note: See TracChangeset
for help on using the changeset viewer.