ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/multicrab.py
(Generate patch)

Comparing COMP/CRAB/python/multicrab.py (file contents):
Revision 1.5 by slacapra, Tue Dec 2 10:48:41 2008 UTC vs.
Revision 1.6 by slacapra, Tue Dec 2 15:41:29 2008 UTC

# Line 164 | Line 164 | class MultiCrab:
164  
165          # read crab.cfg file and search for storage_path
166          cfg_params = loadConfig(self.cfg,{})
167 <        self.user_remote_dir = cfg_params.get("USER.user_remote_dir",None)
167 >        if self.cfg_params.has_key("COMMON"):
168 >            self.user_remote_dir = self.cfg_params["COMMON"].get("user.user_remote_dir", cfg_params.get("USER.user_remote_dir",None))
169 >        else:
170 >            self.user_remote_dir = cfg_params.get("USER.user_remote_dir",None)
171          return
172  
173      def loadMultiConfig(self, file):
# Line 196 | Line 199 | class MultiCrab:
199                  tmp="-"+string.upper(opt.split(".")[0])+"."+opt.split(".")[1]
200                  options[tmp]=self.cfg_params_dataset[sec][opt]
201              # add section to storage_path if exist in crab.cfg
202 <            if self.user_remote_dir:
202 >            if not self.cfg_params_dataset.has_key("USER.user_remote_dir") and self.user_remote_dir:
203                  options["-USER.user_remote_dir"]=self.user_remote_dir+"/"+sec
204              # Input options (command)
205              for opt in self.opts:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines