summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2006-02-23 00:21:35 -0500
committerNathan Binkert <binkertn@umich.edu>2006-02-23 00:21:35 -0500
commitf462266b30abcad6b69c8b29fb1d856c04d6ac1f (patch)
treed99924bfa0c20ffed78ee8e077c1fba8c60fdd14 /util
parent35094fb0fe7113be4d2faa88beb505d3e9155a77 (diff)
downloadgem5-f462266b30abcad6b69c8b29fb1d856c04d6ac1f.tar.xz
don't add an empty suboption description
--HG-- extra : convert_revision : 594744c3d438aed08a23db376959930071b2c368
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)