From 4c371b1dcc5c9ce89b7058e4729460ab7dd123b3 Mon Sep 17 00:00:00 2001
From: pcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8>
Date: Mon, 22 Nov 2010 21:06:09 +0000
Subject: 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
---
 sos/policyredhat.py | 6 +++---
 1 file 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):
-- 
cgit