Hello community,
here is the log from the commit of package hwinfo for openSUSE:Factory
checked in at Mon Mar 14 09:51:39 CET 2011.
--------
--- hwinfo/hwinfo.changes 2011-03-08 11:26:50.000000000 +0100
+++ /mounts/work_src_done/STABLE/hwinfo/hwinfo.changes 2011-03-11
11:43:40.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Mar 11 11:43:28 CET 2011 - snw...@suse.de
+
+- check for battery, too, to decide on notebook (bnc #678456)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
hwinfo-18.4.tar.bz2
New:
----
hwinfo-18.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hwinfo.spec ++++++
--- /var/tmp/diff_new_pack.caTeXT/_old 2011-03-14 09:51:18.000000000 +0100
+++ /var/tmp/diff_new_pack.caTeXT/_new 2011-03-14 09:51:18.000000000 +0100
@@ -33,9 +33,9 @@
PreReq: /sbin/ldconfig
AutoReqProv: on
Summary: Hardware Library
-Version: 18.4
+Version: 18.5
Release: 1
-Source: hwinfo-18.4.tar.bz2
+Source: hwinfo-18.5.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++++++ hwinfo-18.4.tar.bz2 -> hwinfo-18.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hwinfo-18.4/VERSION new/hwinfo-18.5/VERSION
--- old/hwinfo-18.4/VERSION 2011-03-08 11:26:37.000000000 +0100
+++ new/hwinfo-18.5/VERSION 2011-03-11 11:43:19.000000000 +0100
@@ -1 +1 @@
-18.4
+18.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hwinfo-18.4/changelog new/hwinfo-18.5/changelog
--- old/hwinfo-18.4/changelog 2011-03-08 11:26:38.000000000 +0100
+++ new/hwinfo-18.5/changelog 2011-03-11 11:43:20.000000000 +0100
@@ -1,4 +1,7 @@
-2011-03-08: HEAD
+2011-03-11: HEAD
+ - check for battery, too, to decide on notebook (bnc #678456)
+
+2011-03-08: 18.4
- avoid potential NULL pointer reference (bnc #677686)
2011-02-16: 18.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hwinfo-18.4/src/hd/int.c new/hwinfo-18.5/src/hd/int.c
--- old/hwinfo-18.4/src/hd/int.c 2011-02-16 14:19:01.000000000 +0100
+++ new/hwinfo-18.5/src/hd/int.c 2011-03-11 11:36:10.000000000 +0100
@@ -80,6 +80,9 @@
PROGRESS(6, 0, "mouse");
int_mouse(hd_data);
+ /* data already needed in int_system() */
+ hd_sysfs_driver_list(hd_data);
+
#if defined(__i386__) || defined (__x86_64__)
PROGRESS(15, 0, "system info");
int_system(hd_data);
@@ -1083,6 +1086,7 @@
char *s;
struct stat sbuf;
sys_info_t *st;
+ hd_sysfsdrv_t *sf;
for(hd_sys = hd_data->hd; hd_sys; hd_sys = hd_sys->next) {
if(
@@ -1177,6 +1181,16 @@
}
}
+ /* check for battery, too (bnc #678456) */
+ if(!is.notebook) {
+ for(sf = hd_data->sysfsdrv; sf; sf = sf->next) {
+ if(sf->driver && !strcmp(sf->driver, "battery")) {
+ is.notebook = 1;
+ break;
+ }
+ }
+ }
+
ADD2LOG(
" system type:%s%s\n",
is.vendor == v_ibm ? " ibm" :
@@ -1268,8 +1282,6 @@
{
hd_t *hd;
- hd_sysfs_driver_list(hd_data);
-
for(hd = hd_data->hd; hd; hd = hd->next) {
int_update_driver_data(hd_data, hd);
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
