Avoiding warnings when piping /dev/null to sensors-detect (#843507)
This commit is contained in:
parent
88fa7d487c
commit
94142e5e5d
30
lm_sensors-3.3.4-sensors-detect-null-input.patch
Normal file
30
lm_sensors-3.3.4-sensors-detect-null-input.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
diff -Naur lm_sensors-3.3.4.orig/prog/detect/sensors-detect lm_sensors-3.3.4/prog/detect/sensors-detect
|
||||||
|
--- lm_sensors-3.3.4.orig/prog/detect/sensors-detect 2013-05-20 21:25:22.000000000 +0200
|
||||||
|
+++ lm_sensors-3.3.4/prog/detect/sensors-detect 2013-07-25 18:24:41.636807410 +0200
|
||||||
|
@@ -3707,7 +3707,7 @@
|
||||||
|
"Do you want to scan it? (\%s/selectively): ",
|
||||||
|
$default ? "YES/no" : "yes/NO";
|
||||||
|
|
||||||
|
- $input = <STDIN>;
|
||||||
|
+ $input = <STDIN> || '';
|
||||||
|
if ($input =~ /^\s*n/i
|
||||||
|
|| (!$default && $input !~ /^\s*[ys]/i)) {
|
||||||
|
print "\n";
|
||||||
|
@@ -3718,7 +3718,7 @@
|
||||||
|
print "Please enter one or more addresses not to scan. Separate them with commas.\n",
|
||||||
|
"You can specify a range by using dashes. Example: 0x58-0x5f,0x69.\n",
|
||||||
|
"Addresses: ";
|
||||||
|
- $input = <STDIN>;
|
||||||
|
+ $input = <STDIN> || '';
|
||||||
|
chomp($input);
|
||||||
|
@not_to_scan = parse_not_to_scan(0x03, 0x77, $input);
|
||||||
|
} elsif (($class & 0xff00) == 0x0300) {
|
||||||
|
@@ -6859,7 +6859,7 @@
|
||||||
|
"safe though. Yes, you do have ISA I/O ports even if you do not have any\n".
|
||||||
|
"ISA slots! Do you want to scan the ISA I/O ports? (\%s): ",
|
||||||
|
$superio_features ? "yes/NO" : "YES/no";
|
||||||
|
- $input = <STDIN>;
|
||||||
|
+ $input = <STDIN> || '';
|
||||||
|
unless ($input =~ /^\s*n/i
|
||||||
|
|| ($superio_features && $input !~ /^\s*y/i)) {
|
||||||
|
if (initialize_ioports()) {
|
@ -1,6 +1,6 @@
|
|||||||
Name: lm_sensors
|
Name: lm_sensors
|
||||||
Version: 3.3.4
|
Version: 3.3.4
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Hardware monitoring tools
|
Summary: Hardware monitoring tools
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
@ -13,6 +13,8 @@ Source1: lm_sensors.sysconfig
|
|||||||
Source2: sensord.sysconfig
|
Source2: sensord.sysconfig
|
||||||
Source3: sensord.systemd
|
Source3: sensord.systemd
|
||||||
|
|
||||||
|
Patch0: lm_sensors-3.3.4-sensors-detect-null-input.patch
|
||||||
|
|
||||||
%ifarch %{ix86} x86_64
|
%ifarch %{ix86} x86_64
|
||||||
Requires: /usr/sbin/dmidecode
|
Requires: /usr/sbin/dmidecode
|
||||||
%endif
|
%endif
|
||||||
@ -56,6 +58,8 @@ database, and warns of sensor alarms.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
mv prog/init/README prog/init/README.initscripts
|
mv prog/init/README prog/init/README.initscripts
|
||||||
chmod -x prog/init/fancontrol.init
|
chmod -x prog/init/fancontrol.init
|
||||||
|
|
||||||
@ -153,6 +157,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 25 2013 Jaromir Capik <jcapik@redhat.com> - 3.3.4-3
|
||||||
|
- Avoiding warnings when piping /dev/null to sensors-detect (#843507)
|
||||||
|
|
||||||
* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 3.3.4-2
|
* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 3.3.4-2
|
||||||
- Perl 5.18 rebuild
|
- Perl 5.18 rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user