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-18 20:29:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Sat Dec 18 20:29:19 2021 rev:184 rq:941027 version:21.80 Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2021-12-16 21:18:53.158511505 +0100 +++ /work/SRC/openSUSE:Factory/.hwinfo.new.2520/hwinfo.changes 2021-12-18 20:29:20.634212484 +0100 @@ -1,0 +2,7 @@ +Fri Dec 17 09:04:17 UTC 2021 - wfe...@opensuse.org + +- merge gh#openSUSE/hwinfo#109 +- fix logic around cdrom detection +- 21.80 + +-------------------------------------------------------------------- Old: ---- hwinfo-21.79.tar.xz New: ---- hwinfo-21.80.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.RBRGy0/_old 2021-12-18 20:29:21.250212826 +0100 +++ /var/tmp/diff_new_pack.RBRGy0/_new 2021-12-18 20:29:21.254212828 +0100 @@ -37,7 +37,7 @@ License: GPL-2.0-or-later Group: Hardware/Other Url: http://gitorious.org/opensuse/hwinfo -Version: 21.79 +Version: 21.80 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ hwinfo-21.79.tar.xz -> hwinfo-21.80.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.79/VERSION new/hwinfo-21.80/VERSION --- old/hwinfo-21.79/VERSION 2021-12-14 09:54:12.000000000 +0100 +++ new/hwinfo-21.80/VERSION 2021-12-17 10:04:17.000000000 +0100 @@ -1 +1 @@ -21.79 +21.80 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.79/changelog new/hwinfo-21.80/changelog --- old/hwinfo-21.79/changelog 2021-12-14 09:54:12.000000000 +0100 +++ new/hwinfo-21.80/changelog 2021-12-17 10:04:17.000000000 +0100 @@ -1,3 +1,7 @@ +2021-12-17: 21.80 + - merge gh#openSUSE/hwinfo#109 + - fix logic around cdrom detection + 2021-12-14: 21.79 - merge gh#openSUSE/hwinfo#108 - Donot close the open tray after read_cdrom_info. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.79/src/hd/block.c new/hwinfo-21.80/src/hd/block.c --- old/hwinfo-21.79/src/hd/block.c 2021-12-14 09:54:12.000000000 +0100 +++ new/hwinfo-21.80/src/hd/block.c 2021-12-17 10:04:17.000000000 +0100 @@ -1278,11 +1278,13 @@ ci = hd->detail->cdrom.data; - hd->is.notready = 1; + fd = open(hd->unix_dev_name, O_RDONLY|O_NONBLOCK); - 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; + /* we get CDS_DISK_OK if there is a CD in the drive */ + hd->is.notready = fd != -1 && ioctl(fd, CDROM_DRIVE_STATUS, 0) == CDS_DISC_OK ? 0 : 1; + + if(hd->is.notready) { + if(fd != -1) close(fd); return NULL; }
