Merge lp:~mvo/deb-thumbnailer/mvo into lp:deb-thumbnailer

Proposed by Michael Vogt
Status: Merged
Merged at revision: 67
Proposed branch: lp:~mvo/deb-thumbnailer/mvo
Merge into: lp:deb-thumbnailer
Diff against target: 28 lines (+9/-2)
1 file modified
deb-thumbnailer (+9/-2)
To merge this branch: bzr merge lp:~mvo/deb-thumbnailer/mvo
Reviewer Review Type Date Requested Status
Deb Thumbnailer Team Pending
Review via email: mp+83779@code.launchpad.net

Description of the change

Thanks for your quick merge!

I found one more tiny bug that is fixed in this merge proposal.

Cheers,
 Michael

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'deb-thumbnailer'
--- deb-thumbnailer 2011-11-29 11:39:44 +0000
+++ deb-thumbnailer 2011-11-29 13:10:30 +0000
@@ -243,6 +243,7 @@
243 proceed = False243 proceed = False
244 # nautilus calls it with input, output, size244 # nautilus calls it with input, output, size
245 if len(sys.argv) == 4:245 if len(sys.argv) == 4:
246 #print sys.argv
246 try:247 try:
247 size = int(sys.argv[3])248 size = int(sys.argv[3])
248 except ValueError:249 except ValueError:
@@ -253,8 +254,14 @@
253 output = urllib.url2pathname(sys.argv[2]).replace('file://', '')254 output = urllib.url2pathname(sys.argv[2]).replace('file://', '')
254 thumbnailer = DebThumbnailer(input)255 thumbnailer = DebThumbnailer(input)
255 thumbnailer.create_overlay_icon_for_deb(output, size)256 thumbnailer.create_overlay_icon_for_deb(output, size)
256 thumbnailer.cache_icon(output)257 # output is always there, looks like nautilus is creating it, so
257 sys.exit(0)258 # we need to check if the data makes sense
259 # FIXME: do this in a more elegant way
260 if os.path.exists(output) and os.path.getsize(output) > 0:
261 thumbnailer.cache_icon(output)
262 sys.exit(0)
263 # tell nautilus we have no data
264 sys.exit(1)
258 # options?265 # options?
259 elif len(sys.argv) > 1 and sys.argv[1] == '--recreate':266 elif len(sys.argv) > 1 and sys.argv[1] == '--recreate':
260 rm_thumbnails()267 rm_thumbnails()

Subscribers

People subscribed via source and target branches