genebean/Trimage
1
0
Fork 0
mirror of https://github.com/Kilian/Trimage.git synced 2026-01-26 10:08:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git@host.fluxility.com:optimg

Browse source 
Conflicts:
	trimage.py
This commit is contained in:
Kilian Valkhof 2010-02-05 22:30:38 +01:00
commit 0617a1dd5a
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trimage.py
View file

@ -254,7 +254,6 @@ class Worker(QThread):
name = oldfile.fileName() name = oldfile.fileName()
oldfilesize = oldfile.size() oldfilesize = oldfile.size()
oldfilesizestr = size(oldfilesize, system=alternative) oldfilesizestr = size(oldfilesize, system=alternative)
# get extention # get extention
print os.path, type(filename), type(os.path), str(filename) print os.path, type(filename), type(os.path), str(filename)
baseName, extention = os.path.splitext(filename) baseName, extention = os.path.splitext(filename)
@ -270,6 +269,7 @@ class Worker(QThread):
try: try:
retcode = call(runString % {'file' : filename}, shell = True, stdout = PIPE) retcode = call(runString % {'file' : filename}, shell = True, stdout = PIPE)
runfile = retcode runfile = retcode
except OSError, e: except OSError, e:
runfile = e runfile = e