Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add option to make errors in postinstall script fatal

Browse Source
This commit is contained in:
Kovid Goyal 2008-02-11 18:20:17 +00:00
parent d52b6743f9
commit 56b8b42f6c
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libprs500/linux.py
View File

@ -88,7 +88,7 @@ def open_file(path):
os.makedirs(os.path.dirname(path)) os.makedirs(os.path.dirname(path))
return open(path, 'wb') return open(path, 'wb')
def setup_completion(): def setup_completion(fatal_errors):
try: try:
print 'Setting up bash completion...', print 'Setting up bash completion...',
sys.stdout.flush() sys.stdout.flush()
@ -196,11 +196,13 @@ complete -o nospace -F _prs500 prs500
f.close() f.close()
print 'done' print 'done'
except: except:
if fatal_errors:
raise
print 'failed' print 'failed'
import traceback import traceback
traceback.print_exc() traceback.print_exc()
def setup_udev_rules(group_file, reload): def setup_udev_rules(group_file, reload, fatal_errors):
print 'Trying to setup udev rules...' print 'Trying to setup udev rules...'
sys.stdout.flush() sys.stdout.flush()
groups = open(group_file, 'rb').read() groups = open(group_file, 'rb').read()
@ -245,6 +247,8 @@ def setup_udev_rules(group_file, reload):
try: try:
check_call('/etc/init.d/udev reload', shell=True) check_call('/etc/init.d/udev reload', shell=True)
except: except:
if fatal_errors:
raise Exception("Couldn't reload udev, you may have to reboot")
print >>sys.stderr, "Couldn't reload udev, you may have to reboot" print >>sys.stderr, "Couldn't reload udev, you may have to reboot"
def option_parser(): def option_parser():
@ -258,6 +262,8 @@ def option_parser():
help='File from which to read group information. Default: %default') help='File from which to read group information. Default: %default')
parser.add_option('--dont-check-root', action='store_true', default=False, dest='no_root', parser.add_option('--dont-check-root', action='store_true', default=False, dest='no_root',
help='If set, do not check if we are root.') help='If set, do not check if we are root.')
parser.add_option('--make-errors-fatal', action='store_true', default=False,
dest='fatal_errors', help='If set die on errors.')
return parser return parser
def post_install(): def post_install():
@ -271,9 +277,9 @@ def post_install():
global use_destdir global use_destdir
use_destdir = opts.destdir use_destdir = opts.destdir
setup_udev_rules(opts.group_file, not opts.dont_reload) setup_udev_rules(opts.group_file, not opts.dont_reload, opts.fatal_errors)
setup_completion() setup_completion(opts.fatal_errors)
setup_desktop_integration() setup_desktop_integration(opts.fatal_errors)
try: try:
from PyQt4 import Qt from PyQt4 import Qt
@ -323,7 +329,7 @@ MIME = '''\
</mime-info> </mime-info>
''' '''
def setup_desktop_integration(): def setup_desktop_integration(fatal_errors):
try: try:
from PyQt4.QtCore import QFile from PyQt4.QtCore import QFile
from libprs500.gui2 import images_rc # Load images from libprs500.gui2 import images_rc # Load images
@ -368,6 +374,8 @@ def setup_desktop_integration():
os.chdir(cwd) os.chdir(cwd)
shutil.rmtree(tdir) shutil.rmtree(tdir)
except Exception, err: except Exception, err:
if fatal_errors:
raise
print >>sys.stderr, 'Could not setup desktop integration. Error:' print >>sys.stderr, 'Could not setup desktop integration. Error:'
print err print err