diff options
| author | Aur??lio A. Heckert <aurium@gmail.com> | 2008-12-01 22:41:45 +0000 |
|---|---|---|
| committer | aurium <aurium@users.sourceforge.net> | 2008-12-01 22:41:45 +0000 |
| commit | c1d1c5c6831d7370764e4fca019218ab471edf30 (patch) | |
| tree | 4bac6842fd6fa638a9f87c8531db8403817e9d78 | |
| parent | providing compatibility for uniconversor name variations (diff) | |
| download | inkscape-c1d1c5c6831d7370764e4fca019218ab471edf30.tar.gz inkscape-c1d1c5c6831d7370764e4fca019218ab471edf30.zip | |
correcting the changes to provide compatibility for uniconversor name variations
(bzr r6929)
| -rw-r--r-- | share/extensions/uniconv-ext.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/share/extensions/uniconv-ext.py b/share/extensions/uniconv-ext.py index 961498330..f469816f1 100644 --- a/share/extensions/uniconv-ext.py +++ b/share/extensions/uniconv-ext.py @@ -25,7 +25,7 @@ import sys from run_command import run from subprocess import Popen, PIPE -#sys.stderr.write('aaaaaaa') +cmd = 'none' try: p = Popen('uniconv', shell=True, stdout=PIPE, stderr=PIPE).wait() @@ -33,18 +33,18 @@ try: p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait() if p!=127 : cmd = 'uniconvertor' except ImportError: - try: - from popen2 import Popen3 - p = Popen3('uniconv', True).wait() - if p!=32512 : cmd = 'uniconv' - p = Popen3('uniconvertor', True).wait() - if p!=32512 : cmd = 'uniconvertor' - except ImportError: - sys.stderr.write('You need to install the UniConvertor software.\n'+\ - 'For Linux: install the packge python-uniconvertor.\n'+\ - 'For Windows: download it from\n'+\ - 'http://sk1project.org/modules.php?name=Products&product=uniconvertor\n') - -run((cmd+' "%s" "%%s"') % sys.argv[1].replace("%","%%"), "UniConvertor") + from popen2 import Popen3 + p = Popen3('uniconv', True).wait() + if p!=32512 : cmd = 'uniconv' + p = Popen3('uniconvertor', True).wait() + if p!=32512 : cmd = 'uniconvertor' + +if cmd == 'none' : + sys.stderr.write('You need to install the UniConvertor software.\n'+\ + 'For Linux: install the packge python-uniconvertor.\n'+\ + 'For Windows: download it from\n'+\ + 'http://sk1project.org/modules.php?name=Products&product=uniconvertor\n') +else : + run((cmd+' "%s" "%%s"') % sys.argv[1].replace("%","%%"), "UniConvertor") # vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99 |