Mailinglist Archive: opensuse-commit (1083 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package hwinfo
checked in at Thu Sep 6 22:16:47 CEST 2007.

--------
--- hwinfo/hwinfo.changes       2007-09-03 17:07:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/hwinfo/hwinfo.changes  2007-09-04 16:34:37.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep  4 16:34:25 CEST 2007 - snwint@xxxxxxx
+
+- some more dir -> link sysfs changes (#303978)
+
+-------------------------------------------------------------------

Old:
----
  hwinfo-13.49.tar.bz2

New:
----
  hwinfo-13.50.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hwinfo.spec ++++++
--- /var/tmp/diff_new_pack.r15398/_old  2007-09-06 22:16:09.000000000 +0200
+++ /var/tmp/diff_new_pack.r15398/_new  2007-09-06 22:16:09.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package hwinfo (Version 13.49)
+# spec file for package hwinfo (Version 13.50)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -20,9 +20,9 @@
 PreReq:         /sbin/ldconfig %insserv_prereq %fillup_prereq
 Autoreqprov:    on
 Summary:        Hardware Library
-Version:        13.49
+Version:        13.50
 Release:        1
-Source:         hwinfo-13.49.tar.bz2
+Source:         hwinfo-13.50.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -89,6 +89,8 @@
 %doc doc/libhd/html
 
 %changelog
+* Tue Sep 04 2007 - snwint@xxxxxxx
+- some more dir -> link sysfs changes (#303978)
 * Mon Sep 03 2007 - snwint@xxxxxxx
 - slusb: make it a modem (#94155)
 - rework mv643xx detection (#300613)

++++++ hwinfo-13.49.tar.bz2 -> hwinfo-13.50.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.49/Changelog new/hwinfo-13.50/Changelog
--- old/hwinfo-13.49/Changelog  2007-09-03 16:59:48.000000000 +0200
+++ new/hwinfo-13.50/Changelog  2007-09-04 16:33:34.000000000 +0200
@@ -1,3 +1,6 @@
+3/9/2007:      v13.50
+       - some more dir -> link sysfs changes (#303978)
+
 3/9/2007:      v13.49
        - slusb: make it a modem (#94155)
        - rework mv643xx detection (#300613)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.49/src/hd/block.c new/hwinfo-13.50/src/hd/block.c
--- old/hwinfo-13.49/src/hd/block.c     2007-08-21 11:32:36.000000000 +0200
+++ new/hwinfo-13.50/src/hd/block.c     2007-09-04 16:30:10.000000000 +0200
@@ -1342,7 +1342,7 @@
   char *sf_cdev = NULL, *sf_dev = NULL;
   char *sf_drv_name, *sf_drv, *bus_id;
 
-  sf_class = reverse_str_list(read_dir("/sys/class/scsi_tape", 'd'));
+  sf_class = reverse_str_list(read_dir("/sys/class/scsi_tape", 'D'));
 
   if(!sf_class) {
     ADD2LOG("sysfs: no such class: scsi_tape\n");
@@ -1478,7 +1478,7 @@
   char *sf_cdev = NULL, *sf_dev = NULL;
   char *sf_drv_name, *sf_drv, *bus_id;
 
-  sf_class = reverse_str_list(read_dir("/sys/class/scsi_generic", 'd'));
+  sf_class = reverse_str_list(read_dir("/sys/class/scsi_generic", 'D'));
 
   if(!sf_class) {
     ADD2LOG("sysfs: no such class: scsi_generic\n");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.49/src/hd/hd.c new/hwinfo-13.50/src/hd/hd.c
--- old/hwinfo-13.49/src/hd/hd.c        2007-08-23 11:38:45.000000000 +0200
+++ new/hwinfo-13.50/src/hd/hd.c        2007-09-04 16:28:59.000000000 +0200
@@ -2506,7 +2506,12 @@
   struct dirent *de;
   struct stat sbuf;
   char *s;
-  int dir_type;
+  int dir_type, link_allowed = 0;
+
+  if(type == 'D') {
+    type = 'd';
+    link_allowed = 1;
+  }
 
   if(dir_name && (dir = opendir(dir_name))) {
     while((de = readdir(dir))) {
@@ -2532,7 +2537,7 @@
         s = free_mem(s);
       }
 
-      if(dir_type == type) {
+      if(dir_type == type || (link_allowed && dir_type == 'l')) {
         sl = new_mem(sizeof *sl);
         sl->str = new_str(de->d_name);
         if(sl_start)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.49/src/hd/usb.c new/hwinfo-13.50/src/hd/usb.c
--- old/hwinfo-13.49/src/hd/usb.c       2007-04-19 15:45:58.000000000 +0200
+++ new/hwinfo-13.50/src/hd/usb.c       2007-09-04 16:29:39.000000000 +0200
@@ -640,7 +640,7 @@
   char *sf_cdev = NULL, *sf_dev;
   char *sf_drv_name, *sf_drv, *bus_id, *bus_name;
 
-  sf_class = reverse_str_list(read_dir("/sys/class/usb", 'd'));
+  sf_class = reverse_str_list(read_dir("/sys/class/usb", 'D'));
 
   if(!sf_class) {
     ADD2LOG("sysfs: no such class: usb\n");
@@ -808,7 +808,7 @@
   char *sf_cdev = NULL, *sf_dev;
   char *sf_drv_name, *sf_drv, *bus_id, *bus_name;
 
-  sf_class = reverse_str_list(read_dir("/sys/class/tty", 'd'));
+  sf_class = reverse_str_list(read_dir("/sys/class/tty", 'D'));
 
   if(!sf_class) {
     ADD2LOG("sysfs: no such class: tty\n");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.49/VERSION new/hwinfo-13.50/VERSION
--- old/hwinfo-13.49/VERSION    2007-09-03 15:12:57.000000000 +0200
+++ new/hwinfo-13.50/VERSION    2007-09-04 16:31:35.000000000 +0200
@@ -1 +1 @@
-13.49
+13.50


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx