File tree Expand file tree Collapse file tree 1 file changed +4
-12
lines changed Expand file tree Collapse file tree 1 file changed +4
-12
lines changed Original file line number Diff line number Diff line change @@ -48,19 +48,11 @@ def get_macro_values() -> Dict[str, str]:
4848    print ("Defined macros: "  +  str (macros ))
4949    return  macros 
5050
51- 
52- def  _get_env_var (name : str ) ->  str :
53-     try :
54-         return  os .environ [name ]
55-     except :
56-         return  "" 
57- 
58- 
5951MACROS  =  {
60-     "$(MYPVPREFIX)" : _get_env_var ("MYPVPREFIX" ),
61-     "$(EPICS_KIT_ROOT)" : _get_env_var ("EPICS_KIT_ROOT" ),
62-     "$(ICPCONFIGROOT)" : _get_env_var ("ICPCONFIGROOT" ),
63-     "$(ICPVARDIR)" : _get_env_var ("ICPVARDIR" ),
52+     "$(MYPVPREFIX)" : os . environ . get ("MYPVPREFIX"  ,  " " ),
53+     "$(EPICS_KIT_ROOT)" : os . environ . get ("EPICS_KIT_ROOT"  ,  " " ),
54+     "$(ICPCONFIGROOT)" : os . environ . get ("ICPCONFIGROOT"  ,  " " ),
55+     "$(ICPVARDIR)" : os . environ . get ("ICPVARDIR"  ,  " " ),
6456}
6557CONTROL_SYSTEM_PREFIX  =  MACROS ["$(MYPVPREFIX)" ] +  "CS:" 
6658PVPREFIX_MACRO  =  "$(MYPVPREFIX)" 
    
 
   
 
     
   
   
          
     
  
    
     
 
    
      
     
 
     
    You can’t perform that action at this time.
  
 
    
  
     
    
      
        
     
 
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments