From 928e1b68bd0581843d27b7f2865a2d0592c12d61 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan@jankratochvil.net>
Date: Thu, 10 Feb 2022 21:38:43 +0100
Subject: [PATCH] bin/heat: Fix missing: heat.schedule bin/heat: message:
 +Print states for: change refused

---
 bin/heat | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/bin/heat b/bin/heat
index bab4730..74bbbab 100755
--- a/bin/heat
+++ b/bin/heat
@@ -78,7 +78,8 @@ sub schedulenext($) {
   die "No bestnext" if !defined $bestnext;
   return [$prev,$next];
 }
-$finishline=[schedulenext($minutes)->[1]];
+$finishline=schedulenext($minutes);
+$finishline=[$finishline->[1]] if $finishline;
 my $silent=shift if ($ARGV[0]||"") eq "-s";
 logmsg "command: ".join(" ",@ARGV) if !$silent&&@ARGV;
 sub info($) {
@@ -128,10 +129,13 @@ sub printminutes($) {
 }
 if ($silent) {
   if (!defined $newstate&&!defined $reset&&%schedule) {
-    my $prev=schedulenext($minutes)->[0];
-    if ($prev=~m{^@{[ printminutes $minutes ]} (.)\n$}) {
-      $newstate=$1;
-      logmsg "scheduled: $prev";
+    my $prev=schedulenext($minutes);
+    if ($prev) {
+      my $prev=$prev->[0];
+      if ($prev=~m{^@{[ printminutes $minutes ]} (.)\n$}) {
+	$newstate=$1;
+	logmsg "scheduled: $prev";
+      }
     }
   }
   $newstate=$state if !defined $newstate;
@@ -147,7 +151,7 @@ sub setstate() {
   logmsg "$state->$newstate" if $state ne $newstate;
   if ($newstate ne "s") {
     my $pid=readfile "pidof -x dnf;true|";
-    die "\nchange refused: dnf running: $pid" if $pid;
+    die "\n".printminutes($minutes)." change $state".($state eq $newstate?"":"->$newstate")." refused: dnf running: $pid" if $pid;
   }
   my $both={"s"=>[0,0],"0"=>[1,0],"1"=>[1,1]}->{$newstate};
   spawn "$usbrelay 1 ".$both->[0];
@@ -160,7 +164,8 @@ if (!defined $newreset) {
   setstate;
   if (!$silent&&defined $reset) {
     unlink_resetfile;
-    $finishline=[schedulenext($minutes)->[1]];
+    $finishline=schedulenext($minutes);
+    $finishline=[$finishline->[1]] if $finishline;
   }
   finish;
 }
-- 
1.8.3.1