diff options
| -rw-r--r-- | data/defaultsatlists.xml | 7 | ||||
| -rwxr-xr-x | data/skin_default.xml | 6 | ||||
| -rw-r--r-- | lib/gdi/picload.cpp | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | lib/python/Components/Harddisk.py | 47 |
4 files changed, 41 insertions, 20 deletions
diff --git a/data/defaultsatlists.xml b/data/defaultsatlists.xml index 132b427c..ff0ae8b7 100644 --- a/data/defaultsatlists.xml +++ b/data/defaultsatlists.xml @@ -12,11 +12,14 @@ self.condition = self.runWizard self.disableKeys = True </code> </step> - <step id="nopackages" nextstep="finisheddefaultsatlists"> + + <!--step id="nopackages" nextstep="finisheddefaultsatlists"--> + <step id="nopackages" nextstep="scanquestion"> <text value="There are no default services lists in your image." /> </step> - <step id="nothingtoinstall" nextstep="finisheddefaultsatlists"> + <!--step id="nothingtoinstall" nextstep="finisheddefaultsatlists"--> + <step id="nothingtoinstall" nextstep="scanquestion"> <condition> if self.runWizard: self.condition = True diff --git a/data/skin_default.xml b/data/skin_default.xml index 272fdcf9..dcd2e8bb 100755 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -1205,7 +1205,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <widget source="global.CurrentTime" render="Label" position="100,34" zPosition="1" size="26,30" font="Regular;16" valign="top"> <convert type="ClockToText">Format:%S</convert> </widget> - <widget source="session.RecordState" render="FixedLabel" text=" " position="6,30" zPosition="1" size="120,34"> + <widget source="session.RecordState" render="FixedLabel" text=" " position="6,32" zPosition="1" size="126,32"> <convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert> <convert type="ConditionalShowHide">Blink</convert> </widget> @@ -1221,7 +1221,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <widget source="global.CurrentTime" render="Label" position="0,38" size="96,26" font="Regular;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" > <convert type="ClockToText">Format:%H:%M</convert> </widget> - <widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,30"> + <widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,26"> <convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert> <convert type="ConditionalShowHide">Blink</convert> </widget> @@ -1253,7 +1253,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <widget source="global.CurrentTime" render="Label" position="0,38" size="96,26" font="Regular;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" > <convert type="ClockToText">Format:%H:%M</convert> </widget> - <widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,30"> + <widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,26"> <convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert> <convert type="ConditionalShowHide">Blink</convert> </widget> diff --git a/lib/gdi/picload.cpp b/lib/gdi/picload.cpp index 7fabef5e..c162f89d 100644 --- a/lib/gdi/picload.cpp +++ b/lib/gdi/picload.cpp @@ -671,7 +671,6 @@ void ePicLoad::decodeThumb() m_filepara->id = F_JPEG; eDebug("[Picload] Cache File found"); } - fclose(f); } } diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index e8e612a4..7f837565 100755..100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -5,6 +5,10 @@ from SystemInfo import SystemInfo import time from Components.Console import Console +def MajorMinor(path): + rdev = stat(path).st_rdev + return (major(rdev),minor(rdev)) + def readFile(filename): file = open(filename) data = file.read().strip() @@ -125,13 +129,15 @@ class Harddisk: for line in lines: parts = line.strip().split(" ") - if path.realpath(parts[0]).startswith(self.dev_path): - try: + real_path = path.realpath(parts[0]) + if not real_path[-1].isdigit(): + continue + try: + if MajorMinor(real_path) == MajorMinor(self.partitionPath(real_path[-1])): stat = statvfs(parts[1]) - except OSError: - continue - return stat.f_bfree/1000 * stat.f_bsize/1000 - + return stat.f_bfree/1000 * stat.f_bsize/1000 + except OSError: + pass return -1 def numPartitions(self): @@ -168,10 +174,17 @@ class Harddisk: cmd = "umount" - for line in lines: - parts = line.strip().split(" ") - if path.realpath(parts[0]).startswith(self.dev_path): - cmd = ' ' . join([cmd, parts[1]]) + for line in lines: + parts = line.strip().split(" ") + real_path = path.realpath(parts[0]) + if not real_path[-1].isdigit(): + continue + try: + if MajorMinor(real_path) == MajorMinor(self.partitionPath(real_path[-1])): + cmd = ' ' . join([cmd, parts[1]]) + break + except OSError: + pass res = system(cmd) return (res >> 8) @@ -201,10 +214,16 @@ class Harddisk: res = -1 for line in lines: parts = line.strip().split(" ") - if path.realpath(parts[0]) == self.partitionPath("1"): - cmd = "mount -t ext3 " + parts[0] - res = system(cmd) - break + real_path = path.realpath(parts[0]) + if not real_path[-1].isdigit(): + continue + try: + if MajorMinor(real_path) == MajorMinor(self.partitionPath(real_path[-1])): + cmd = "mount -t ext3 " + parts[0] + res = system(cmd) + break + except OSError: + pass return (res >> 8) |