rpms/nut/F-7 nut.spec,1.43,1.44 ups.init,1.6,1.7

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17799

Modified Files:
	nut.spec ups.init 
Log Message:
* Wed Aug 15 2007 Tomas Smetana <tsmetana at redhat.com> 2.0.5-4
- fix #248173 - nut status query is broken



Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/F-7/nut.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- nut.spec	26 Mar 2007 13:32:55 -0000	1.43
+++ nut.spec	16 Aug 2007 11:42:30 -0000	1.44
@@ -9,9 +9,9 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.0.5
-Release: 3
+Release: 4
 Group: Applications/System
-License: GPL
+License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.networkupstools.org/
 Source: http://www.networkupstools.org/source/2.0/%{name}-%{version}.tar.gz
@@ -288,6 +288,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Wed Aug 15 2007 Tomas Smetana <tsmetana at redhat.com> 2.0.5-4
+- fix #248173 - nut status query is broken
+
 * Mon Mar 26 2007 Than Ngo <than at redhat.com> 2.0.5-3
 - cleanup
 


Index: ups.init
===================================================================
RCS file: /cvs/pkgs/rpms/nut/F-7/ups.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ups.init	9 Sep 2004 09:22:07 -0000	1.6
+++ ups.init	16 Aug 2007 11:42:30 -0000	1.7
@@ -103,7 +103,10 @@
 	status)
 		if [ "$SERVER" = "yes" ]; then
 			if [ "$MODEL" = "upsdrvctl" ]; then
-				/sbin/upsdrvctl -v status
+				for MYMODEL in $(egrep '^[[:space:]]*driver' /etc/ups/ups.conf \
+						| sed 's/.*=[[:space:]]*//'); do 
+					status $MYMODEL
+				done
 			else
 				status $MODEL
 			fi