aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Components/Harddisk.py
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-11-03 19:40:57 +0100
committerghost <andreas.monzner@multimedia-labs.de>2009-11-03 19:40:57 +0100
commit18469e4dedcfe75e8128b489774f79fb790a23da (patch)
tree23deb7ca13fe969e5966f2e3ca8951fc063fd0f2 /lib/python/Components/Harddisk.py
parentf488e1db5b364c4df7135008a3b073a1d0ba06ca (diff)
parent7560beb3e371704d798259ca1ea927bf4575306c (diff)
downloadenigma2-18469e4dedcfe75e8128b489774f79fb790a23da.tar.gz
enigma2-18469e4dedcfe75e8128b489774f79fb790a23da.zip
Merge branch 'bug_236_recordpath' into experimental
Diffstat (limited to 'lib/python/Components/Harddisk.py')
-rwxr-xr-xlib/python/Components/Harddisk.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 2efdb68f..03f574f3 100755
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -290,7 +290,10 @@ class Harddisk:
# any access has been made to the disc. If there has been no access over a specifed time,
# we set the hdd into standby.
def readStats(self):
- l = readFile("/sys/block/%s/stat" % self.device)
+ try:
+ l = open("/sys/block/%s/stat" % self.device).read()
+ except IOError:
+ return -1,-1
(nr_read, _, _, _, nr_write) = l.split()[:5]
return int(nr_read), int(nr_write)
@@ -319,7 +322,7 @@ class Harddisk:
l = sum(stats)
print "sum", l, "prev_sum", self.last_stat
- if l != self.last_stat: # access
+ if l != self.last_stat and l >= 0: # access
print "hdd was accessed since previous check!"
self.last_stat = l
self.last_access = t