summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/pbs/jobfile.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/util/pbs/jobfile.py b/util/pbs/jobfile.py
index 5cdd343de..fd19b3bf5 100644
--- a/util/pbs/jobfile.py
+++ b/util/pbs/jobfile.py
@@ -277,10 +277,11 @@ class Option(Data):
return name
if attr == 'desc':
- desc = self.__dict__[attr]
- if self._suboption is not None:
- desc = '%s, %s' % (desc, self._suboption.desc)
- return desc
+ desc = [ self.__dict__[attr] ]
+ if self._suboption is not None and self._suboption.desc:
+ desc.append(self._suboption.desc)
+ return ', '.join(desc)
+
return super(Option, self).__getattribute__(attr)