From 647bb5785e39b3132d4924a6f43a163e242ce0e9 Mon Sep 17 00:00:00 2001
From: sconklin <sconklin@ef72aa8b-4018-0410-8976-d6e080ef94d8>
Date: Mon, 14 Aug 2006 14:25:37 +0000
Subject: Preparing release for RHEL evaluation, fixed noisy setup, incremented
 release

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@40 ef72aa8b-4018-0410-8976-d6e080ef94d8
---
 src/setup.py  |  4 ++--
 src/sos.spec  | 13 ++++++++-----
 src/sosreport |  6 +++---
 3 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/setup.py b/src/setup.py
index cabdfef2..8c39f621 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.9',
+	version = '0.1.10',
 	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
@@ -18,7 +18,7 @@ setup(
 	support technicians and developers.""",
 	author = 'Steve Conklin, et al.',
 	author_email = 'sconklin@redhat.com',
-	url = 'http://support.redhat.com/',
+	url = 'http://sos.108.redhat.com/',
 	packages = ['sos', 'sos.plugins'],
 	scripts = [],
 	package_dir = {'': 'lib',},
diff --git a/src/sos.spec b/src/sos.spec
index 1d9a95f0..c0217de2 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 9
+%define release 10
 
 Summary: System Support Tools
 Name: %{name}
@@ -16,7 +16,7 @@ Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: python >= 0:2.3
-URL: http://www.redhat.com/support/
+URL: http://sos.108.redhat.com
 # Using local source tarball until this can be released to public CVS system
 Source0: %{name}-%{version}.tar.bz2
 
@@ -31,12 +31,12 @@ support technicians and developers.
 %setup
 
 %build
-python setup.py build
+python setup.py -q build
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 # The python setup.py does the same thing as the make install in other packages
-%{__python} setup.py install --root=${RPM_BUILD_ROOT}
+%{__python} setup.py -q install --root=${RPM_BUILD_ROOT}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,7 +53,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc README TODO
 
 %changelog
-* Mon Jul 17 2006 Steve Conklin <sconklin@redhat.com> - 0.1-9
+* Mon Aug 14 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-10
+- minor bugfixes, added miltithreading option, setup now quiet
+
+* Mon Jul 17 2006 Steve Conklin <sconklin at redhat dot 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
diff --git a/src/sosreport b/src/sosreport
index 7f18ff1d..dd12c2fb 100755
--- a/src/sosreport
+++ b/src/sosreport
@@ -190,9 +190,9 @@ def sosreport():
         try:
             len(cmdLineOpts.noplugins)
             if plugname not in cmdLineOpts.noplugins:
-                        names, parms = plug.getAllOptions()
-                        for optname, optparm  in zip(names, parms):
-                            alloptions.append((plug, plugname, optname, optparm))
+                names, parms = plug.getAllOptions()
+                for optname, optparm  in zip(names, parms):
+                    alloptions.append((plug, plugname, optname, optparm))
         except:
             names, parms = plug.getAllOptions()
             for optname, optparm  in zip(names, parms):
-- 
cgit