From abfe72dbf66581eee17ef1cab556a4d234166068 Mon Sep 17 00:00:00 2001
From: sconklin <sconklin@ef72aa8b-4018-0410-8976-d6e080ef94d8>
Date: Mon, 17 Jul 2006 18:35:09 +0000
Subject: Fixed a problem with html links in the report to output of commands
 run in plugins, increment release.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@29 ef72aa8b-4018-0410-8976-d6e080ef94d8
---
 src/lib/sos/plugintools.py | 4 +++-
 src/setup.py               | 2 +-
 src/sos.spec               | 5 ++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/lib/sos/plugintools.py b/src/lib/sos/plugintools.py
index 1a0fd9d4..b4aa9cf3 100644
--- a/src/lib/sos/plugintools.py
+++ b/src/lib/sos/plugintools.py
@@ -278,8 +278,10 @@ class PluginBase:
         # Command Output
         if len(self.executedCommands):
             html = html + "<p>Commands Executed:<br><ul>\n"
+            # convert file name to relative path from our root
             for cmd in self.executedCommands:
-                html = html + '<li><a href="%s">%s</a></li>\n' % (cmd['file'], cmd['exe'])
+                cmdOutRelPath = sosRelPath(self.cInfo['rptdir'], cmd['file'])
+                html = html + '<li><a href="%s">%s</a></li>\n' % (cmdOutRelPath, cmd['exe'])
             html = html + "</ul></p>\n"
 
         # Alerts
diff --git a/src/setup.py b/src/setup.py
index 83361a0b..cabdfef2 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -10,7 +10,7 @@ import sys,os,time
 # change release in spec file along with this version string
 setup(
 	name = 'sos',
-	version = '0.1.8',
+	version = '0.1.9',
 	description = 'System Support Tools',
 	long_description = """Sos is a set of tools that gathers information about system
 	hardware and configuration. The information can then be used for
diff --git a/src/sos.spec b/src/sos.spec
index 3cc80732..1d9a95f0 100644
--- a/src/sos.spec
+++ b/src/sos.spec
@@ -5,7 +5,7 @@
 %define name sos
 %define version 0.1
 # change release in setup.py and this file
-%define release 8
+%define release 9
 
 Summary: System Support Tools
 Name: %{name}
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README TODO
 
 %changelog
+* Mon Jul 17 2006 Steve Conklin <sconklin@redhat.com> - 0.1-9
+- migrated to svn on 108.redhat.com, fixed a problem with command output linking in report
+
 * Mon Jun 19 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-6
 - Added LICENSE file containing GPL
 
-- 
cgit