diff options
| -rw-r--r-- | src/setup.py | 2 | ||||
| -rw-r--r-- | src/sos.spec | 1 | ||||
| -rwxr-xr-x | src/sosreport | 18 |
3 files changed, 13 insertions, 8 deletions
diff --git a/src/setup.py b/src/setup.py index 233874c1..d02eb295 100644 --- a/src/setup.py +++ b/src/setup.py @@ -9,6 +9,6 @@ setup( packages = ['sos', 'sos.plugins'], scripts = [], package_dir = {'': 'lib',}, - data_files = [ ('/usr/sbin', ['sosreport', 'extras/sysreport.legacy']), ('/usr/share/man/man1', ['sosreport.1']), ('/usr/share/locale/en', []), ('/usr/share/locale/it', []), ('/usr/share/locale/en/LC_MESSAGES', ['locale/en/LC_MESSAGES/sos.mo']), ('/usr/share/locale/it/LC_MESSAGES', ['locale/it/LC_MESSAGES/sos.mo']), ('/usr/share/locale/fr/LC_MESSAGES', ['locale/fr/LC_MESSAGES/sos.mo']) + data_files = [ ('/usr/sbin', ['sosreport', 'extras/sysreport/sysreport.legacy']), ('/usr/share/sysreport', ['extras/sysreport/text.xsl', 'extras/sysreport/functions', 'extras/sysreport/sysreport-fdisk']), ('/usr/share/man/man1', ['sosreport.1']), ('/usr/share/locale/en', []), ('/usr/share/locale/it', []), ('/usr/share/locale/en/LC_MESSAGES', ['locale/en/LC_MESSAGES/sos.mo']), ('/usr/share/locale/it/LC_MESSAGES', ['locale/it/LC_MESSAGES/sos.mo']), ('/usr/share/locale/fr/LC_MESSAGES', ['locale/fr/LC_MESSAGES/sos.mo']) ] ) diff --git a/src/sos.spec b/src/sos.spec index d69402c4..721a4d83 100644 --- a/src/sos.spec +++ b/src/sos.spec @@ -49,6 +49,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/sosreport /usr/sbin/sysreport /usr/sbin/sysreport.legacy +/usr/share/sysreport %{python_sitelib}/sos/ %{_mandir}/man1/sosreport.1* %{_localedir}/*/LC_MESSAGES/sos.mo diff --git a/src/sosreport b/src/sosreport index 876c1df4..302373ae 100755 --- a/src/sosreport +++ b/src/sosreport @@ -606,13 +606,17 @@ Press ENTER to continue, or CTRL-C to quit. plugrunning = Semaphore(2) for plugname, plug in loadedplugins: soslog.log(logging.VERBOSE, "executing plugin %s" % plugname) - if not __cmdLineOpts__.nomultithread: - plug.copyStuff(threaded = True, semaphore = plugrunning) - else: - plug.copyStuff() - if __cmdLineOpts__.progressbar: - pbar.incAmount(plug.eta_weight) - pbar.update() + try: + if not __cmdLineOpts__.nomultithread: + plug.copyStuff(threaded = True, semaphore = plugrunning) + else: + plug.copyStuff() + if __cmdLineOpts__.progressbar: + pbar.incAmount(plug.eta_weight) + pbar.update() + except: + if __raisePlugins__: + raise del plugrunning # Wait for all the collection threads to exit |