|
@@ -18,6 +18,7 @@
|
|
|
import errno
|
|
import errno
|
|
|
import logging
|
|
import logging
|
|
|
import os
|
|
import os
|
|
|
|
|
+import re
|
|
|
import time
|
|
import time
|
|
|
|
|
|
|
|
from django.utils.translation import ugettext as _
|
|
from django.utils.translation import ugettext as _
|
|
@@ -178,8 +179,8 @@ class Submission(object):
|
|
|
parameters = dict([(var, '') for var in find_variables(xml, include_named=False) if not self._is_coordinator() or var not in DATASET_FREQUENCY])
|
|
parameters = dict([(var, '') for var in find_variables(xml, include_named=False) if not self._is_coordinator() or var not in DATASET_FREQUENCY])
|
|
|
|
|
|
|
|
if properties:
|
|
if properties:
|
|
|
- parameters.update(dict([line.strip().split('=')
|
|
|
|
|
- for line in properties.split('\n') if not line.startswith('#') and len(line.strip().split('=')) == 2]))
|
|
|
|
|
|
|
+ parameters.update(dict([re.split(r'(?<!\\)=', line.strip())
|
|
|
|
|
+ for line in properties.split('\n') if not line.startswith('#') and len(re.split(r'(?<!\\)=', line.strip())) == 2]))
|
|
|
return parameters
|
|
return parameters
|
|
|
|
|
|
|
|
def _update_properties(self, jobtracker_addr, deployment_dir=None):
|
|
def _update_properties(self, jobtracker_addr, deployment_dir=None):
|