diff options
| author | pcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2010-11-22 21:06:09 +0000 |
|---|---|---|
| committer | pcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2010-11-22 21:06:09 +0000 |
| commit | 4c371b1dcc5c9ce89b7058e4729460ab7dd123b3 (patch) | |
| tree | b39d2c37f7b48531bfc3d5e84efe0686e11eaf8b | |
| parent | 8dba98b460b32b1c7ee0c66efa395f11b80a0ea2 (diff) | |
| download | sos-4c371b1dcc5c9ce89b7058e4729460ab7dd123b3.tar.gz | |
Revert "always include the hostname"
This reverts changeset 1023. Shouldn't have been commited...
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@1027 ef72aa8b-4018-0410-8976-d6e080ef94d8
| -rwxr-xr-x | sos/policyredhat.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sos/policyredhat.py b/sos/policyredhat.py index 5400bbda..863445ae 100755 --- a/sos/policyredhat.py +++ b/sos/policyredhat.py @@ -220,6 +220,9 @@ class SosPolicy: print sys.exit(0) + if len(self.reportName) == 0: + self.reportName = localname + if self.cInfo['cmdlineopts'].customerName: self.reportName = self.cInfo['cmdlineopts'].customerName self.reportName = re.sub(r"[^a-zA-Z.0-9]", "", self.reportName) @@ -228,9 +231,6 @@ class SosPolicy: self.ticketNumber = self.cInfo['cmdlineopts'].ticketNumber self.ticketNumber = re.sub(r"[^0-9]", "", self.ticketNumber) - if self.reportName != localname: - self.reportName += "." + localname - return def renameResults(self, newName): |