rpms/vdr/devel vdr-halt.local.sh,1.3,1.4 vdr.spec,1.33,1.34

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15666

Modified Files:
	vdr-halt.local.sh vdr.spec 
Log Message:
No pending recordings already handled by vdr-shutdown.sh, revert.


Index: vdr-halt.local.sh
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr-halt.local.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vdr-halt.local.sh	22 Nov 2008 20:14:56 -0000	1.3
+++ vdr-halt.local.sh	22 Nov 2008 20:37:26 -0000	1.4
@@ -17,21 +17,19 @@
 
 if [ -s $wakeupfile ] ; then
     secs=$(cat $wakeupfile)
-    if [ "$secs" != "0" ] ; then
-        datestr="1970-01-01 UTC $secs sec"
-        echo -n "Setting wakeup for next VDR timer: " ; date -d "$datestr"
-        if [ -w $rtcdir/wakealarm ] ; then
-            offset=0
-            [ -r $rtcdir/since_epoch ] && \
-                offset=$(( $(cat $rtcdir/since_epoch) - $(date +%s) ))
-            echo 0                      > $rtcdir/wakealarm
-            echo $(( $secs + $offset )) > $rtcdir/wakealarm
-        elif [ -w $procalarm ] ; then
-            grep -qsx UTC /etc/adjtime && utc=--utc || utc=
-            date $utc -d "$datestr" +"%F %T" > $procalarm
-        else
-            echo "Warning: no supported methods found, wakeup not set."
-            sleep 1
-        fi
+    datestr="1970-01-01 UTC $secs sec"
+    echo -n "Setting wakeup for next VDR timer: " ; date -d "$datestr"
+    if [ -w $rtcdir/wakealarm ] ; then
+        offset=0
+        [ -r $rtcdir/since_epoch ] && \
+            offset=$(( $(cat $rtcdir/since_epoch) - $(date +%s) ))
+        echo 0                      > $rtcdir/wakealarm
+        echo $(( $secs + $offset )) > $rtcdir/wakealarm
+    elif [ -w $procalarm ] ; then
+        grep -qsx UTC /etc/adjtime && utc=--utc || utc=
+        date $utc -d "$datestr" +"%F %T" > $procalarm
+    else
+        echo "Warning: no supported methods found, wakeup not set."
+        sleep 1
     fi
 fi


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- vdr.spec	22 Nov 2008 20:20:43 -0000	1.33
+++ vdr.spec	22 Nov 2008 20:37:26 -0000	1.34
@@ -496,7 +496,6 @@
 %changelog
 * Sat Nov 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-8
 - Fix setting wakeup time via rtc0 when hardware clock is localtime.
-- Do not try to set wakeup time if there are no pending recordings.
 - Drop remote plugin examples from udev rules, they're in vdr-remote now.
 
 * Tue Oct 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-7