Changeset 665
- Timestamp:
- Jan 25, 2014, 10:05:32 PM (11 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r663 r665 1 2014-01-25 <rybkin@lal.in2p3.fr> 523 2 3 * source/cmt_symbol.cxx: In class SetBuilder, PathBuilder functions build, 4 do not set error for environment variable access if set or path is defined 5 in requirements 6 * source/cmt_error.cxx: In class CmtError function print, output diagnostic 7 messages for error called "warning" as warnings 8 1 9 2014-01-10 <rybkin@lal.in2p3.fr> 522 2 10 … … 298 306 fill_selection, fill_exclusion functions to implement enhanced handling of 299 307 special CMTHOME, CMTUSERCONTEXT projects packages (visited if in current 300 project only) and andspecial depth values (0: CMTUSERCONTEXT project308 project only) or with special depth values (0: CMTUSERCONTEXT project 301 309 packages only, -1: CMTHOME project packages only), in 302 310 do_check_configuration function, check tags from CmtContext m_extra_tags, … … 310 318 use_current_package, use_extra_file functions do not attempt to locate 311 319 current package if current use located already, factor out 312 Pattern::apply_all_globals izeand Tag::restore_tree calls into separate320 Pattern::apply_all_globals and Tag::restore_tree calls into separate 313 321 apply_globals function called after all requirements are read, in 314 322 use_special_requirements function set special use style, structuring_style, -
CMT/HEAD/source/cmt_error.cxx
r663 r665 174 174 cerr << "CMT> Error: " << get_error_name (e.get_code ()) << " : " << e.get_text () << endl; 175 175 */ 176 CmtMessage::error (get_last_error ()); 176 if (CmtError::get_last_error_code () != CmtError::warning) 177 CmtMessage::error (get_last_error ()); 178 else 179 CmtMessage::warning (get_last_error ()); 177 180 } 178 181 -
CMT/HEAD/source/cmt_symbol.cxx
r663 r665 2369 2369 resolve_value (new_value, symbol.name, temp); 2370 2370 temp = new_value; 2371 2372 // We clear the error since the set is defined in requirements 2373 // and the environment variable ought not to have been used 2374 if (CmtError::get_last_error_code () == CmtError::warning && 2375 CmtError::get_last_error () == 2376 CmtError::get_error_name (CmtError::warning) + ": " "getenv (" + symbol.name + ") denied") 2377 CmtError::clear (); 2371 2378 } 2372 2379 else if (temp == "") … … 2391 2398 CmtError::set (CmtError::warning, 2392 2399 "getenv (" + symbol.name + ") denied"); 2393 return ""; 2400 // return ""; 2401 // We will clear the error if the set is defined in requirements 2394 2402 } 2395 2403 } … … 2680 2688 CmtError::set (CmtError::warning, 2681 2689 "getenv (" + symbol.name + ") denied"); 2682 return ""; 2690 // return ""; 2691 // We will clear the error if the path is defined in requirements 2683 2692 } 2684 2693 … … 2722 2731 //temp = new_value; 2723 2732 filter_path_value (symbol, temp_vector); 2733 2734 // We clear the error since the path is defined in requirements 2735 // and the environment variable ought not to have been used 2736 if (CmtError::get_last_error_code () == CmtError::warning && 2737 CmtError::get_last_error () == 2738 CmtError::get_error_name (CmtError::warning) + ": " "getenv (" + symbol.name + ") denied") 2739 CmtError::clear (); 2724 2740 } 2725 2741 … … 3819 3835 { 3820 3836 // print error occurred before value expansion 3821 CmtMessage::error (msg); 3837 if (code != CmtError::warning) 3838 CmtMessage::error (msg); 3839 else 3840 CmtMessage::warning (msg); 3822 3841 } 3823 3842 // We keep CmtError::warning to indicate that
Note: See TracChangeset
for help on using the changeset viewer.