diff options
| author | astokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2009-07-23 15:58:49 +0000 |
|---|---|---|
| committer | astokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2009-07-23 15:58:49 +0000 |
| commit | 34a24cd813c61bcb8e5e5a8511b9d6048f520900 (patch) | |
| tree | 01630ddf61619b842aee76b1ce561c6319477285 | |
| parent | f23e0d9a7293c1eb01cfb6a9d7f370b49724d91e (diff) | |
| download | sos-34a24cd813c61bcb8e5e5a8511b9d6048f520900.tar.gz | |
updates
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@617 ef72aa8b-4018-0410-8976-d6e080ef94d8
| -rwxr-xr-x | src/lib/sos/policyredhat.py | 6 | ||||
| -rw-r--r-- | src/sos.spec | 4 | ||||
| -rwxr-xr-x | src/sosreport | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/sos/policyredhat.py b/src/lib/sos/policyredhat.py index 26004140..b5a02203 100755 --- a/src/lib/sos/policyredhat.py +++ b/src/lib/sos/policyredhat.py @@ -229,6 +229,11 @@ class SosPolicy: def packageResults(self): + if len(self.ticketNumber): + self.reportName = self.reportName + "." + self.ticketNumber + else: + self.reportName = self.reportName + self.renameResults("sosreport-%s-%s.tar.bz2" % (self.reportName, time.strftime("%Y%m%d%H%M%S"))) tarcmd = "/bin/tar -jcf %s %s" % (self.report_file, os.path.basename(self.cInfo['dstroot'])) @@ -241,7 +246,6 @@ class SosPolicy: status, shout = commands.getstatusoutput(tarcmd) os.umask(oldmask) os.chdir(curwd) - return def cleanDstroot(self): diff --git a/src/sos.spec b/src/sos.spec index eaa99ac0..fc549d6b 100644 --- a/src/sos.spec +++ b/src/sos.spec @@ -56,8 +56,10 @@ rm -rf ${RPM_BUILD_ROOT} * Thu Jul 23 2009 Adam Stokes <ajs at redhat dot com> = 1.8-14 - resolves: rhbz512536 wrong group in spec file - resolves: rhbz498398 A series of refactoring patches to sos +- resolves: rhbz501149 A series of refactoring patches to sos (2) +- resolves: rhbz503804 remove obsolete translation - resolves: rhbz502455 tricking sosreport into rm -rf / -- resolves: rhbz501149 a series of refactoring patches (2) +- resolves: rhbz501146 branding in fedora * Mon Jul 20 2009 Adam Stokes <ajs at redhat dot com> = 1.8-13 - Add requirements for tar,bzip2 during minimal installs diff --git a/src/sosreport b/src/sosreport index f59c964e..63f45928 100755 --- a/src/sosreport +++ b/src/sosreport @@ -667,7 +667,7 @@ def sosreport(): hardware and setup of your Fedora system. The information is collected and an archive is packaged under /tmp, which you can send to a support representative. -Red Hat will use this information for diagnostic purposes ONLY +Fedora will use this information for diagnostic purposes ONLY and it will be considered confidential information. This process may take a while to complete. |