Author: croberts
Date: 2011-05-18 14:51:52 +0000 (Wed, 18 May 2011)
New Revision: 4769
Modified:
trunk/cumin/python/cumin/grid/job.py
Log:
Update to previous fix for BZ:
https://bugzilla.redhat.com/show_bug.cgi?id=703196 Since
our workaround is to put quotes in the edit box, we should be able to support that even
after the fix is in. This fix allows us to work whether the user quoted their string or
not.
Modified: trunk/cumin/python/cumin/grid/job.py
===================================================================
--- trunk/cumin/python/cumin/grid/job.py 2011-05-18 13:47:58 UTC (rev 4768)
+++ trunk/cumin/python/cumin/grid/job.py 2011-05-18 14:51:52 UTC (rev 4769)
@@ -678,10 +678,10 @@
orig = float(orig)
if fval != orig:
if ftype == "string":
- quoted = "\"%s\"" % fval
+ quoted = "\"%s\"" %
strip_string_quotes(fval)
if quoted == orig:
continue
- just_ads[unicode(field)] = quoted #strings must be quoted, or
condor will treat it as an expression
+ just_ads[unicode(field)] = quoted #string
else:
just_ads[unicode(field)] = fval