diff options
| author | shnavid <shnavid@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-08-03 10:27:37 +0000 |
|---|---|---|
| committer | shnavid <shnavid@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-08-03 10:27:37 +0000 |
| commit | b2ed24d1023f094deb7ce54ab59ca4384db646a5 (patch) | |
| tree | 55af6568e96497345004f19bb330e1eb7baa06ed /src/lib | |
| parent | b469def0940d7bdccc04d6372d7fdf8b565d5a08 (diff) | |
| download | sos-b2ed24d1023f094deb7ce54ab59ca4384db646a5.tar.gz | |
version bumped to 1.7-6pre0
fixed gettext messages
moved policy.preWork() after plugins.diagnose()
cluster diagnose better messages
yum diagnose() disabled for now
fixed gettext stuff in Makefile
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@326 ef72aa8b-4018-0410-8976-d6e080ef94d8
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/sos/plugins/cluster.py | 5 | ||||
| -rw-r--r-- | src/lib/sos/plugins/yum.py | 2 | ||||
| -rwxr-xr-x | src/lib/sos/policyredhat.py | 10 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/lib/sos/plugins/cluster.py b/src/lib/sos/plugins/cluster.py index a996d362..8fc10c93 100644 --- a/src/lib/sos/plugins/cluster.py +++ b/src/lib/sos/plugins/cluster.py @@ -150,7 +150,10 @@ class cluster(sos.plugintools.PluginBase): # check fencing (warn on no fencing) if len(xpathContext.xpathEval("/cluster/clusternodes/clusternode[not(fence/method/device)]")): - self.addDiagnose("one or more nodes have no fencing agent configured") + if self.has_gfs(): + self.addDiagnose("one or more nodes have no fencing agent configured: fencing is required for GFS to work") + else: + self.addDiagnose("one or more nodes have no fencing agent configured: the cluster infrastructure might not work as intended") # check fencing (warn on manual) if len(xpathContext.xpathEval("/cluster/clusternodes/clusternode[/cluster/fencedevices/fencedevice[@agent='fence_manual']/@name=fence/method/device/@name]")): diff --git a/src/lib/sos/plugins/yum.py b/src/lib/sos/plugins/yum.py index 16347763..1f389d30 100644 --- a/src/lib/sos/plugins/yum.py +++ b/src/lib/sos/plugins/yum.py @@ -27,6 +27,8 @@ class yum(sos.plugintools.PluginBase): return False def diagnose(self): + # FIXME: diagnose should only report actual problems, disabling this for now. + return True # repo sanity checking # TODO: elaborate/validate actual repo files, however this directory should # be empty on RHEL 5+ systems. diff --git a/src/lib/sos/policyredhat.py b/src/lib/sos/policyredhat.py index 89414b86..13368e2f 100755 --- a/src/lib/sos/policyredhat.py +++ b/src/lib/sos/policyredhat.py @@ -124,12 +124,12 @@ class SosPolicy: localname = commands.getoutput("/bin/uname -n").split(".")[0] try: - self.reportName = raw_input("Please enter your first initial and last name [%s]: " % localname) + self.reportName = raw_input(_("Please enter your first initial and last name [%s]: ") % localname) self.reportName = re.sub(r"[^a-zA-Z.0-9]", "", self.reportName) if len(self.reportName) == 0: self.reportName = localname - self.ticketNumber = raw_input("Please enter the case number that you are generating this report for: ") + self.ticketNumber = raw_input(_("Please enter the case number that you are generating this report for: ")) self.ticketNumber = re.sub(r"[^0-9]", "", self.ticketNumber) print except KeyboardInterrupt: @@ -182,12 +182,12 @@ class SosPolicy: fp.close() sys.stdout.write("\n") - print "Your sosreport has been generated and saved in:\n %s" % tarballName + print _("Your sosreport has been generated and saved in:\n %s") % tarballName print if md5out: - print "The md5sum is: " + md5out + print _("The md5sum is: ") + md5out print - print "Please send this file to your support representative." + print _("Please send this file to your support representative.") sys.stdout.write("\n") return |