Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2014-08-20 17:53:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2014-05-27 18:23:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hwinfo.new/hwinfo.changes 2014-08-20 17:54:06.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 15 11:11:28 CEST 2014 - [email protected] + +- create floppy entry only if there really is a floppy device (bnc #883465) +- 21.6 + +------------------------------------------------------------------- Old: ---- hwinfo-21.5.tar.xz New: ---- hwinfo-21.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.a9BOH5/_old 2014-08-20 17:54:07.000000000 +0200 +++ /var/tmp/diff_new_pack.a9BOH5/_new 2014-08-20 17:54:07.000000000 +0200 @@ -36,9 +36,9 @@ Group: Hardware/Other # Until migration to github this should be correct url Url: http://gitorious.org/opensuse/hwinfo -Version: 21.5 +Version: 21.6 Release: 0 -Source: hwinfo-21.5.tar.xz +Source: hwinfo-21.6.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ hwinfo-21.5.tar.xz -> hwinfo-21.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.5/VERSION new/hwinfo-21.6/VERSION --- old/hwinfo-21.5/VERSION 2014-05-27 10:22:48.000000000 +0200 +++ new/hwinfo-21.6/VERSION 2014-08-15 11:11:18.000000000 +0200 @@ -1 +1 @@ -21.5 +21.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.5/changelog new/hwinfo-21.6/changelog --- old/hwinfo-21.5/changelog 2014-05-27 10:22:49.000000000 +0200 +++ new/hwinfo-21.6/changelog 2014-08-15 11:11:23.000000000 +0200 @@ -1,4 +1,7 @@ -2014-05-27: HEAD +2014-08-15: HEAD + - create floppy entry only if there really is a floppy device (bnc #883465) + +2014-05-27: 21.5 - make ethtool private flags tri-state: (unset, false, true) 2014-04-24: 21.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.5/src/hd/floppy.c new/hwinfo-21.6/src/hd/floppy.c --- old/hwinfo-21.5/src/hd/floppy.c 2013-10-07 13:45:32.000000000 +0200 +++ new/hwinfo-21.6/src/hd/floppy.c 2014-08-15 11:08:02.000000000 +0200 @@ -116,7 +116,14 @@ floppy_ctrls++; } - if(floppy_ctrls && !(floppy_created & (1 << u))) { + struct stat sbuf; + unsigned floppy_exists = 0; + char *floppy_name = NULL; + str_printf(&floppy_name, 0, "/dev/fd%u", u); + floppy_exists = stat(floppy_name, &sbuf) ? 0 : 1; + free_mem(floppy_name); + + if(floppy_ctrls && !(floppy_created & (1 << u)) && floppy_exists) { hd = add_hd_entry(hd_data, __LINE__, 0); hd->base_class.id = bc_storage_device; hd->sub_class.id = sc_sdev_floppy; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
