Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2021-12-16 21:18:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Thu Dec 16 21:18:44 2021 rev:183 rq:940411 version:21.79 Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2021-11-13 22:48:28.581247677 +0100 +++ /work/SRC/openSUSE:Factory/.hwinfo.new.2520/hwinfo.changes 2021-12-16 21:18:53.158511505 +0100 @@ -1,0 +2,8 @@ +Tue Dec 14 08:54:12 UTC 2021 - wfe...@opensuse.org + +- merge gh#openSUSE/hwinfo#108 +- Donot close the open tray after read_cdrom_info. +- Donot close the open tray after read. +- 21.79 + +-------------------------------------------------------------------- Old: ---- hwinfo-21.78.tar.xz New: ---- hwinfo-21.79.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.SxStSO/_old 2021-12-16 21:18:55.178512274 +0100 +++ /var/tmp/diff_new_pack.SxStSO/_new 2021-12-16 21:18:55.186512277 +0100 @@ -37,7 +37,7 @@ License: GPL-2.0-or-later Group: Hardware/Other Url: http://gitorious.org/opensuse/hwinfo -Version: 21.78 +Version: 21.79 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ hwinfo-21.78.tar.xz -> hwinfo-21.79.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.78/VERSION new/hwinfo-21.79/VERSION --- old/hwinfo-21.78/VERSION 2021-11-11 18:14:55.000000000 +0100 +++ new/hwinfo-21.79/VERSION 2021-12-14 09:54:12.000000000 +0100 @@ -1 +1 @@ -21.78 +21.79 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.78/changelog new/hwinfo-21.79/changelog --- old/hwinfo-21.78/changelog 2021-11-11 18:14:55.000000000 +0100 +++ new/hwinfo-21.79/changelog 2021-12-14 09:54:12.000000000 +0100 @@ -1,3 +1,8 @@ +2021-12-14: 21.79 + - merge gh#openSUSE/hwinfo#108 + - Donot close the open tray after read_cdrom_info. + - Donot close the open tray after read. + 2021-11-11: 21.78 - merge gh#openSUSE/hwinfo#106 - Always read numerical 32bit serial number from EDID header. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.78/src/hd/block.c new/hwinfo-21.79/src/hd/block.c --- old/hwinfo-21.78/src/hd/block.c 2021-11-11 18:14:55.000000000 +0100 +++ new/hwinfo-21.79/src/hd/block.c 2021-12-14 09:54:12.000000000 +0100 @@ -1278,11 +1278,11 @@ ci = hd->detail->cdrom.data; - hd->is.notready = 0; + hd->is.notready = 1; - if((fd = open(hd->unix_dev_name, O_RDONLY)) < 0) { - /* we are here if there is no CD in the drive */ - hd->is.notready = 1; + if((fd = open(hd->unix_dev_name, O_RDONLY|O_NONBLOCK)) > 0) { + /* we get CDS_DISK_OK if there is CD in the drive */ + ioctl(fd, CDROM_DRIVE_STATUS, 0) == CDS_DISC_OK ? hd->is.notready = 0 : NULL; return NULL; }
