4316: [NarWeb] Missing document.png

svn: r17742
This commit is contained in:
Michiel Nauta 2011-06-10 17:05:45 +00:00
parent dda9c5eaf6
commit f86751865c
2 changed files with 2 additions and 3 deletions

View File

@ -272,8 +272,7 @@ def run_thumbnailer(mime_type, src_file, dest_file, size=SIZE_NORMAL):
'%o' : dest_file, '%o' : dest_file,
} }
cmdlist = [ sublist.get(x, x) for x in cmd.split() ] cmdlist = [ sublist.get(x, x) for x in cmd.split() ]
os.spawnvpe(os.P_WAIT, cmdlist[0], cmdlist, os.environ) return os.spawnvpe(os.P_WAIT, cmdlist[0], cmdlist, os.environ) == 0
return True
return False return False
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

View File

@ -3082,7 +3082,7 @@ class MediaPage(BasePage):
self.report.copy_file(thmb_path, npath) self.report.copy_file(thmb_path, npath)
path = npath path = npath
os.unlink(thmb_path) os.unlink(thmb_path)
except IOError: except EnvironmentError:
path = os.path.join("images", "document.png") path = os.path.join("images", "document.png")
else: else:
path = os.path.join("images", "document.png") path = os.path.join("images", "document.png")