ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CRAB/python/SchedulerGlite.py

Comparing COMP/CRAB/python/SchedulerGlite.py (file contents):
Revision 1.8 by slacapra, Tue Oct 17 10:06:53 2006 UTC vs.
Revision 1.10 by slacapra, Wed Jan 17 18:17:58 2007 UTC

#	Line 55 | Line 55 | class SchedulerGlite(SchedulerEdg):
55		for i in range(len(ce_white_list)):
56		if i == 0:
57		if (req == ' '):
58	<	req = req + '((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
58	>	req = req + '((RegExp("' + string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
59		else:
60	<	req = req +  ' && ((RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
60	>	req = req +  ' && ((RegExp("' + string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
61		pass
62		else:
63	<	req = req +  ' || (RegExp("' + ce_white_list[i] + '", other.GlueCEUniqueId))'
63	>	req = req +  ' || (RegExp("' + string.strip(ce_white_list[i]) + '", other.GlueCEUniqueId))'
64		req = req + ')'
65
66		if self.EDG_ce_black_list:
67		ce_black_list = string.split(self.EDG_ce_black_list,',')
68		for ce in ce_black_list:
69		if (req == ' '):
70	<	req = req + '(!RegExp("' + ce + '", other.GlueCEUniqueId))'
70	>	req = req + '(!RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId))'
71		else:
72	<	req = req +  ' && (!RegExp("' + ce + '", other.GlueCEUniqueId))'
72	>	req = req +  ' && (!RegExp("' + string.strip(ce) + '", other.GlueCEUniqueId))'
73		pass
74		if self.EDG_clock_time:
75		if (req == ' '):
#	Line 90 | Line 90 | class SchedulerGlite(SchedulerEdg):
90		itr4=self.findSites_(first[i])
91		reqSites=''
92		reqtmp=[]
93	–	j = 0
93		concString = '||'
94		for arg in itr4:
95		#############

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines