From e2ea89dbbe1b1731ba4eda7fbe40ea315594a1c9 Mon Sep 17 00:00:00 2001 From: navid Date: Thu, 22 Nov 2007 10:40:27 +0000 Subject: merged navid-dev back into trunk, see spec file for details git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@457 ef72aa8b-4018-0410-8976-d6e080ef94d8 --- src/Makefile | 10 + src/extras/htmlog | 473 -------------- src/extras/sos-html-logs/lib/__init__.py | 0 src/extras/sos-html-logs/lib/helpers.py | 41 ++ src/extras/sos-html-logs/lib/logs_abstraction.py | 415 ++++++++++++ src/extras/sos-html-logs/lib/parsers/__init__.py | 0 .../sos-html-logs/lib/parsers/crazyclock_parser.py | 24 + .../sos-html-logs/lib/parsers/dmapper_parser.py | 106 ++++ .../sos-html-logs/lib/parsers/simple_parser.py | 29 + .../sos-html-logs/lib/parsers/simple_parser.rules | 38 ++ .../sos-html-logs/share/html/overlib/BabelFish.js | 58 ++ .../share/html/overlib/ajaxcontentmws.js | 181 ++++++ .../sos-html-logs/share/html/overlib/arrow.gif | Bin 0 -> 88 bytes .../share/html/overlib/calendarmws.js | 621 ++++++++++++++++++ .../share/html/overlib/calendarmws_lang.js | 700 +++++++++++++++++++++ .../sos-html-logs/share/html/overlib/cornerBL.gif | Bin 0 -> 205 bytes .../sos-html-logs/share/html/overlib/cornerBR.gif | Bin 0 -> 208 bytes .../sos-html-logs/share/html/overlib/cornerTL.gif | Bin 0 -> 207 bytes .../sos-html-logs/share/html/overlib/cornerTR.gif | Bin 0 -> 206 bytes .../sos-html-logs/share/html/overlib/edgeB.gif | Bin 0 -> 47 bytes .../sos-html-logs/share/html/overlib/edgeL.gif | Bin 0 -> 48 bytes .../sos-html-logs/share/html/overlib/edgeR.gif | Bin 0 -> 48 bytes .../sos-html-logs/share/html/overlib/edgeT.gif | Bin 0 -> 47 bytes .../sos-html-logs/share/html/overlib/exit.gif | Bin 0 -> 866 bytes .../sos-html-logs/share/html/overlib/flower.gif | Bin 0 -> 4255 bytes .../share/html/overlib/iframecontentmws.js | 53 ++ .../sos-html-logs/share/html/overlib/license.html | 265 ++++++++ .../sos-html-logs/share/html/overlib/loading.gif | Bin 0 -> 674 bytes .../share/html/overlib/objectcontentmws.js | 16 + .../sos-html-logs/share/html/overlib/oval.gif | Bin 0 -> 3662 bytes .../share/html/overlib/overlibCompat.js | 30 + .../share/html/overlib/overlibConfig.txt | 641 +++++++++++++++++++ .../sos-html-logs/share/html/overlib/overlibmws.js | 666 ++++++++++++++++++++ .../share/html/overlib/overlibmws_bubble.js | 199 ++++++ .../share/html/overlib/overlibmws_crossframe.js | 44 ++ .../share/html/overlib/overlibmws_debug.js | 120 ++++ .../share/html/overlib/overlibmws_draggable.js | 85 +++ .../share/html/overlib/overlibmws_exclusive.js | 58 ++ .../share/html/overlib/overlibmws_filter.js | 184 ++++++ .../share/html/overlib/overlibmws_function.js | 44 ++ .../share/html/overlib/overlibmws_hide.js | 81 +++ .../share/html/overlib/overlibmws_iframe.js | 93 +++ .../share/html/overlib/overlibmws_modal.js | 149 +++++ .../share/html/overlib/overlibmws_overtwo.js | 129 ++++ .../share/html/overlib/overlibmws_print.js | 141 +++++ .../share/html/overlib/overlibmws_regCore.js | 75 +++ .../share/html/overlib/overlibmws_scroll.js | 70 +++ .../share/html/overlib/overlibmws_shadow.js | 113 ++++ .../share/html/overlib/overlibmwslogo.gif | Bin 0 -> 1403 bytes .../sos-html-logs/share/html/overlib/print.gif | Bin 0 -> 866 bytes .../sos-html-logs/share/html/overlib/pushpin.gif | Bin 0 -> 1854 bytes .../sos-html-logs/share/html/overlib/quotation.gif | Bin 0 -> 1080 bytes .../sos-html-logs/share/html/overlib/semitrans.gif | Bin 0 -> 757 bytes .../share/html/overlib/showCalendar.gif | Bin 0 -> 200 bytes .../sos-html-logs/share/html/overlib/sprintf.js | 133 ++++ .../sos-html-logs/share/html/overlib/square.gif | Bin 0 -> 2580 bytes src/extras/sos-html-logs/sos-html-logs | 670 ++++++++++++++++++++ src/extras/sysreport/functions | 4 +- src/extras/sysreport/sysreport.legacy | 104 +-- src/lib/sos/plugins/cluster.py | 10 + src/lib/sos/plugins/general.py | 2 + src/lib/sos/plugins/kdump.py | 30 + src/lib/sos/plugins/kernel.py | 2 +- src/lib/sos/plugins/systemtap.py | 9 +- src/lib/sos/plugintools.py | 14 +- src/lib/sos/policyredhat.py | 63 +- src/locale/af/LC_MESSAGES/sos.po | 176 ++++++ src/locale/am/LC_MESSAGES/sos.po | 176 ++++++ src/locale/as/LC_MESSAGES/sos.po | 176 ++++++ src/locale/be/LC_MESSAGES/sos.po | 176 ++++++ src/locale/bg/LC_MESSAGES/sos.po | 176 ++++++ src/locale/bn/LC_MESSAGES/sos.po | 176 ++++++ src/locale/bn_IN/LC_MESSAGES/sos.po | 192 ++++++ src/locale/bs/LC_MESSAGES/sos.po | 176 ++++++ src/locale/ca/LC_MESSAGES/sos.po | 176 ++++++ src/locale/cs/LC_MESSAGES/sos.po | 177 ++++++ src/locale/cy/LC_MESSAGES/sos.po | 176 ++++++ src/locale/da/LC_MESSAGES/sos.po | 177 ++++++ src/locale/de/LC_MESSAGES/sos.po | 192 ++++++ src/locale/el/LC_MESSAGES/sos.po | 177 ++++++ src/locale/en_GB/LC_MESSAGES/sos.po | 190 ++++++ src/locale/es/LC_MESSAGES/sos.po | 192 ++++++ src/locale/et/LC_MESSAGES/sos.po | 177 ++++++ src/locale/eu_ES/LC_MESSAGES/sos.po | 176 ++++++ src/locale/fa/LC_MESSAGES/sos.po | 176 ++++++ src/locale/fi/LC_MESSAGES/sos.po | 177 ++++++ src/locale/fr/LC_MESSAGES/sos.po | 192 +++--- src/locale/gl/LC_MESSAGES/sos.po | 176 ++++++ src/locale/gu/LC_MESSAGES/sos.po | 192 ++++++ src/locale/he/LC_MESSAGES/sos.po | 177 ++++++ src/locale/hi/LC_MESSAGES/sos.po | 192 ++++++ src/locale/hr/LC_MESSAGES/sos.po | 178 ++++++ src/locale/hu/LC_MESSAGES/sos.po | 177 ++++++ src/locale/hy/LC_MESSAGES/sos.po | 176 ++++++ src/locale/id/LC_MESSAGES/sos.po | 176 ++++++ src/locale/ilo/LC_MESSAGES/sos.po | 176 ++++++ src/locale/is/LC_MESSAGES/sos.po | 176 ++++++ src/locale/it/LC_MESSAGES/sos.po | 140 +++-- src/locale/ja/LC_MESSAGES/sos.po | 191 ++++++ src/locale/ka/LC_MESSAGES/sos.po | 176 ++++++ src/locale/kn/LC_MESSAGES/sos.po | 176 ++++++ src/locale/ko/LC_MESSAGES/sos.po | 191 ++++++ src/locale/ku/LC_MESSAGES/sos.po | 176 ++++++ src/locale/lo/LC_MESSAGES/sos.po | 176 ++++++ src/locale/lt/LC_MESSAGES/sos.po | 178 ++++++ src/locale/lv/LC_MESSAGES/sos.po | 178 ++++++ src/locale/mk/LC_MESSAGES/sos.po | 176 ++++++ src/locale/ml/LC_MESSAGES/sos.po | 191 ++++++ src/locale/mr/LC_MESSAGES/sos.po | 176 ++++++ src/locale/ms/LC_MESSAGES/sos.po | 176 ++++++ src/locale/my/LC_MESSAGES/sos.po | 176 ++++++ src/locale/nb/LC_MESSAGES/sos.po | 177 ++++++ src/locale/nl/LC_MESSAGES/sos.po | 177 ++++++ src/locale/nn/LC_MESSAGES/sos.po | 177 ++++++ src/locale/no/LC_MESSAGES/sos.po | 177 ++++++ src/locale/nso/LC_MESSAGES/sos.po | 176 ++++++ src/locale/or/LC_MESSAGES/sos.po | 176 ++++++ src/locale/pa/LC_MESSAGES/sos.po | 191 ++++++ src/locale/pl/LC_MESSAGES/sos.po | 188 ++++++ src/locale/pt/LC_MESSAGES/sos.po | 177 ++++++ src/locale/pt_BR/LC_MESSAGES/sos.po | 188 ++++++ src/locale/ro/LC_MESSAGES/sos.po | 176 ++++++ src/locale/ru/LC_MESSAGES/sos.po | 178 ++++++ src/locale/si/LC_MESSAGES/sos.po | 192 ++++++ src/locale/sk/LC_MESSAGES/sos.po | 177 ++++++ src/locale/sl/LC_MESSAGES/sos.po | 178 ++++++ src/locale/sq/LC_MESSAGES/sos.po | 176 ++++++ src/locale/sr/LC_MESSAGES/sos.po | 178 ++++++ src/locale/sr@latin/LC_MESSAGES/sos.po | 178 ++++++ src/locale/sv/LC_MESSAGES/sos.po | 177 ++++++ src/locale/ta/LC_MESSAGES/sos.po | 190 ++++++ src/locale/te/LC_MESSAGES/sos.po | 176 ++++++ src/locale/th/LC_MESSAGES/sos.po | 176 ++++++ src/locale/tr/LC_MESSAGES/sos.po | 177 ++++++ src/locale/uk/LC_MESSAGES/sos.po | 178 ++++++ src/locale/ur/LC_MESSAGES/sos.po | 176 ++++++ src/locale/vi/LC_MESSAGES/sos.po | 177 ++++++ src/locale/zh_CN/LC_MESSAGES/sos.po | 192 ++++++ src/locale/zh_TW/LC_MESSAGES/sos.po | 190 ++++++ src/locale/zu/LC_MESSAGES/sos.po | 176 ++++++ src/setup.py | 2 +- src/sos-internal.spec | 43 +- src/sos.conf | 14 + src/sos.spec | 57 +- src/sosreport | 21 +- 145 files changed, 19721 insertions(+), 683 deletions(-) delete mode 100755 src/extras/htmlog create mode 100644 src/extras/sos-html-logs/lib/__init__.py create mode 100644 src/extras/sos-html-logs/lib/helpers.py create mode 100644 src/extras/sos-html-logs/lib/logs_abstraction.py create mode 100644 src/extras/sos-html-logs/lib/parsers/__init__.py create mode 100644 src/extras/sos-html-logs/lib/parsers/crazyclock_parser.py create mode 100644 src/extras/sos-html-logs/lib/parsers/dmapper_parser.py create mode 100644 src/extras/sos-html-logs/lib/parsers/simple_parser.py create mode 100644 src/extras/sos-html-logs/lib/parsers/simple_parser.rules create mode 100644 src/extras/sos-html-logs/share/html/overlib/BabelFish.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/ajaxcontentmws.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/arrow.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/calendarmws.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/calendarmws_lang.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/cornerBL.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/cornerBR.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/cornerTL.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/cornerTR.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/edgeB.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/edgeL.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/edgeR.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/edgeT.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/exit.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/flower.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/iframecontentmws.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/license.html create mode 100644 src/extras/sos-html-logs/share/html/overlib/loading.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/objectcontentmws.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/oval.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibCompat.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibConfig.txt create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws_bubble.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws_crossframe.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws_debug.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws_draggable.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws_exclusive.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws_filter.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws_function.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws_hide.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws_iframe.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws_modal.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws_overtwo.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws_print.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws_regCore.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws_scroll.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmws_shadow.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/overlibmwslogo.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/print.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/pushpin.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/quotation.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/semitrans.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/showCalendar.gif create mode 100644 src/extras/sos-html-logs/share/html/overlib/sprintf.js create mode 100644 src/extras/sos-html-logs/share/html/overlib/square.gif create mode 100755 src/extras/sos-html-logs/sos-html-logs create mode 100644 src/lib/sos/plugins/kdump.py create mode 100644 src/locale/af/LC_MESSAGES/sos.po create mode 100644 src/locale/am/LC_MESSAGES/sos.po create mode 100644 src/locale/as/LC_MESSAGES/sos.po create mode 100644 src/locale/be/LC_MESSAGES/sos.po create mode 100644 src/locale/bg/LC_MESSAGES/sos.po create mode 100644 src/locale/bn/LC_MESSAGES/sos.po create mode 100644 src/locale/bn_IN/LC_MESSAGES/sos.po create mode 100644 src/locale/bs/LC_MESSAGES/sos.po create mode 100644 src/locale/ca/LC_MESSAGES/sos.po create mode 100644 src/locale/cs/LC_MESSAGES/sos.po create mode 100644 src/locale/cy/LC_MESSAGES/sos.po create mode 100644 src/locale/da/LC_MESSAGES/sos.po create mode 100644 src/locale/de/LC_MESSAGES/sos.po create mode 100644 src/locale/el/LC_MESSAGES/sos.po create mode 100644 src/locale/en_GB/LC_MESSAGES/sos.po create mode 100644 src/locale/es/LC_MESSAGES/sos.po create mode 100644 src/locale/et/LC_MESSAGES/sos.po create mode 100644 src/locale/eu_ES/LC_MESSAGES/sos.po create mode 100644 src/locale/fa/LC_MESSAGES/sos.po create mode 100644 src/locale/fi/LC_MESSAGES/sos.po create mode 100644 src/locale/gl/LC_MESSAGES/sos.po create mode 100644 src/locale/gu/LC_MESSAGES/sos.po create mode 100644 src/locale/he/LC_MESSAGES/sos.po create mode 100644 src/locale/hi/LC_MESSAGES/sos.po create mode 100644 src/locale/hr/LC_MESSAGES/sos.po create mode 100644 src/locale/hu/LC_MESSAGES/sos.po create mode 100644 src/locale/hy/LC_MESSAGES/sos.po create mode 100644 src/locale/id/LC_MESSAGES/sos.po create mode 100644 src/locale/ilo/LC_MESSAGES/sos.po create mode 100644 src/locale/is/LC_MESSAGES/sos.po create mode 100644 src/locale/ja/LC_MESSAGES/sos.po create mode 100644 src/locale/ka/LC_MESSAGES/sos.po create mode 100644 src/locale/kn/LC_MESSAGES/sos.po create mode 100644 src/locale/ko/LC_MESSAGES/sos.po create mode 100644 src/locale/ku/LC_MESSAGES/sos.po create mode 100644 src/locale/lo/LC_MESSAGES/sos.po create mode 100644 src/locale/lt/LC_MESSAGES/sos.po create mode 100644 src/locale/lv/LC_MESSAGES/sos.po create mode 100644 src/locale/mk/LC_MESSAGES/sos.po create mode 100644 src/locale/ml/LC_MESSAGES/sos.po create mode 100644 src/locale/mr/LC_MESSAGES/sos.po create mode 100644 src/locale/ms/LC_MESSAGES/sos.po create mode 100644 src/locale/my/LC_MESSAGES/sos.po create mode 100644 src/locale/nb/LC_MESSAGES/sos.po create mode 100644 src/locale/nl/LC_MESSAGES/sos.po create mode 100644 src/locale/nn/LC_MESSAGES/sos.po create mode 100644 src/locale/no/LC_MESSAGES/sos.po create mode 100644 src/locale/nso/LC_MESSAGES/sos.po create mode 100644 src/locale/or/LC_MESSAGES/sos.po create mode 100644 src/locale/pa/LC_MESSAGES/sos.po create mode 100644 src/locale/pl/LC_MESSAGES/sos.po create mode 100644 src/locale/pt/LC_MESSAGES/sos.po create mode 100644 src/locale/pt_BR/LC_MESSAGES/sos.po create mode 100644 src/locale/ro/LC_MESSAGES/sos.po create mode 100644 src/locale/ru/LC_MESSAGES/sos.po create mode 100644 src/locale/si/LC_MESSAGES/sos.po create mode 100644 src/locale/sk/LC_MESSAGES/sos.po create mode 100644 src/locale/sl/LC_MESSAGES/sos.po create mode 100644 src/locale/sq/LC_MESSAGES/sos.po create mode 100644 src/locale/sr/LC_MESSAGES/sos.po create mode 100644 src/locale/sr@latin/LC_MESSAGES/sos.po create mode 100644 src/locale/sv/LC_MESSAGES/sos.po create mode 100644 src/locale/ta/LC_MESSAGES/sos.po create mode 100644 src/locale/te/LC_MESSAGES/sos.po create mode 100644 src/locale/th/LC_MESSAGES/sos.po create mode 100644 src/locale/tr/LC_MESSAGES/sos.po create mode 100644 src/locale/uk/LC_MESSAGES/sos.po create mode 100644 src/locale/ur/LC_MESSAGES/sos.po create mode 100644 src/locale/vi/LC_MESSAGES/sos.po create mode 100644 src/locale/zh_CN/LC_MESSAGES/sos.po create mode 100644 src/locale/zh_TW/LC_MESSAGES/sos.po create mode 100644 src/locale/zu/LC_MESSAGES/sos.po create mode 100644 src/sos.conf diff --git a/src/Makefile b/src/Makefile index bcfa5324..37c384bc 100644 --- a/src/Makefile +++ b/src/Makefile @@ -74,6 +74,16 @@ internal-rpm: gpgkey @test -f sos-internal.spec @mkdir -p $(TOPDIR)/SOURCES $(TOPDIR)/SRPMS $(TOPDIR)/RPMS $(TOPDIR)/BUILD $(SRCDIR)/dist cp gpgkeys/rhsupport.pub gpgkeys/rhsupport.key $(TOPDIR)/SOURCES + +# this builds an RPM from the current working copy + @cd $(TOPDIR)/BUILD ; \ + rm -rf $(NAME)-$(VERSION) ; \ + ln -s $(SRCDIR) $(NAME)-$(VERSION) ; \ + tar --gzip --exclude=.svn --exclude=svn-commit.tmp --exclude=$(NAME)-$(VERSION)/build --exclude=$(NAME)-$(VERSION)/dist \ + --exclude gpgkeys/rhsupport.pub --exclude gpgkeys/rhsupport.key \ + -chSpf $(TOPDIR)/SOURCES/$(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION) ; \ + rm -f $(NAME)-$(VERSION) + rpmbuild -ba --define="_topdir $(TOPDIR)" sos-internal.spec @mv $(TOPDIR)/RPMS/noarch/$(NAME)-internal-*.rpm $(TOPDIR)/SRPMS/$(NAME)-internal-*.rpm dist/ cp gpgkeys/rhsupport.key dist/ diff --git a/src/extras/htmlog b/src/extras/htmlog deleted file mode 100755 index 87d9e9c1..00000000 --- a/src/extras/htmlog +++ /dev/null @@ -1,473 +0,0 @@ -#!/usr/bin/env python - -#from optparse import OptionParser, Option -import time, sys, os, glob -import getopt, re - -#__cmdParser__ = OptionParser() -#__cmdParser__.add_option("-i", "--input", action="append", -# dest="logfiles", type="string", metavar = "FILE", -# help="system log to parse") -#__cmdParser__.add_option("-v", "--verbose", action="count", -# dest="verbosity", -# help="How obnoxious we're being about telling the user what we're doing.") -#(__cmdLineOpts__, __cmdLineArgs__)=__cmdParser__.parse_args() - -class htmlgen_class: - - def __init__(self): - self.html_fname_base = "/tmp/something" - self.page_num = 0 - self.page_line = 0 - self.page_fp = None - self.cur_time = None - self.old_time = None - - self.summary_fp = open(self.html_fname_base + ".html", "w") - self.summary_fp.write("