Hello community, here is the log from the commit of package supportutils checked in at Thu Oct 23 22:44:50 CEST 2008. -------- --- supportutils/supportutils.changes 2008-10-16 22:48:59.000000000 +0200 +++ /d/STABLE/supportutils/supportutils.changes 2008-10-23 17:48:53.197657000 +0200 @@ -1,0 +2,8 @@ +Fri Oct 17 14:38:25 MDT 2008 - jrecord@novell.com + +-added plugin skipped (bnc#436655) +-added timed_log_cmd to plugins (bnc#436624) +-fixed executible plugin check (bnc#436625) +-added SMT support in smt.txt (bnc#436627) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ supportutils.spec ++++++ --- /var/tmp/diff_new_pack.t13627/_old 2008-10-23 22:44:17.000000000 +0200 +++ /var/tmp/diff_new_pack.t13627/_new 2008-10-23 22:44:17.000000000 +0200 @@ -25,7 +25,7 @@ Group: System/Management AutoReqProv: on Version: 1.01 -Release: 12 +Release: 13 Source: %{name}-%{version}.tar.gz Summary: Support Troubleshooting Tools BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -85,6 +85,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 17 2008 jrecord@novell.com +-added plugin skipped (bnc#436655) +-added timed_log_cmd to plugins (bnc#436624) +-fixed executible plugin check (bnc#436625) +-added SMT support in smt.txt (bnc#436627) * Thu Oct 16 2008 jrecord@novell.com -SLES10 now includes infiniband probe -added InfiniBand and disk commands ++++++ supportutils-1.01.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportconfig new/supportutils-1.01/supportconfig --- old/supportutils-1.01/supportconfig 2008-10-16 22:36:30.000000000 +0200 +++ new/supportutils-1.01/supportconfig 2008-10-23 17:47:55.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/bash -SVER=2.25-40 -SDATE="2008 10 16" +SVER=2.25-44 +SDATE="2008 10 17" ############################################################################## # supportconfig - Gathers system troubleshooting information for NTS. @@ -79,6 +79,7 @@ OPTION_SAR=1 OPTION_SLERT=1 OPTION_SLP=1 +OPTION_SMT=1 OPTION_SMART=0 OPTION_SMB=1 OPTION_SRAID=1 @@ -946,6 +947,28 @@ echolog Done } +smt_info() { + printlog "SMT..." + test $OPTION_SMT -eq 0 && { echolog Excluded; return 1; } + OF=smt.txt + if rpm_verify $OF smt; then + check_service $OF smt + CONF=/etc/smt.conf + conf_files $OF /etc/smt.conf + sed -i -e 's/^NUPass=[[:alnum:]]*/NUPass=*REMOVED*/;s/^pass=[[:alnum:]]*/pass=*REMOVED*/;s/^ProxyUser=[[:alnum:]]*/ProxyUser=*REMOVED*/;s/^mailServerPassword=[[:alnum:]]*/mailServerPassword=*REMOVED*/;s/^credentials=[[:alnum:]]*/credentials=*REMOVED*/' $LOG/$OF + FILES=$(find /etc/smt.d -type f) + conf_files $OF $FILES + log_cmd $OF 'smt-catalogs -o' + log_cmd $OF 'smt-list-registrations' + log_cmd $OF 'smt-list-products' + FILES=$(find /var/log -type f | grep smt- | grep log$) + test $ADD_OPTION_LOGS -eq 1 && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES + echolog Done + else + echolog Skipped + fi +} + update_info() { printlog "Updates..." test $OPTION_UP -eq 0 && { echolog Excluded; return 1; } @@ -2846,6 +2869,7 @@ printlog " Plugin: ${PLUGIN}..." test $((PLUGIN_OPTION_${PLUGIN})) -eq 0 && { echolog Excluded; continue; } PLUGIN_ERROR=0 + PLUGIN_SKIP=0 PLUGIN_LOG_FILE="plugin-${PLUGIN}.txt" PLUGIN_LOG="${LOG}/${PLUGIN_LOG_FILE}" PLUGIN_BIN="${XPLUGIN_DIR}/${PLUGIN}" @@ -2854,11 +2878,18 @@ log_write $PLUGIN_LOG_FILE "#==[ Plugin Output: $PLUGIN_BIN ]====#" log_write $PLUGIN_LOG_FILE "#==[" - if [ -f $PLUGIN_BIN ]; then - $PLUGIN_BIN >> $PLUGIN_LOG 2>&1 - test $? -gt 0 && ((PLUGIN_ERROR++)) + if [ -x $PLUGIN_BIN ]; then + timed_log_cmd $PLUGIN_LOG_FILE "$PLUGIN_BIN" + PLUGIN_RC=$? + if [ $PLUGIN_RC -ne 0 ]; then + if [ $PLUGIN_RC -eq 111 ]; then + ((PLUGIN_SKIP++)) + else + ((PLUGIN_ERROR++)) + fi + fi else - log_write $PLUGIN_LOG_FILE "Error executing plugin" + log_write $PLUGIN_LOG_FILE "ERROR: Missing or non-executible plugin" ((PLUGIN_ERROR++)) fi log_write $PLUGIN_LOG_FILE @@ -2872,8 +2903,11 @@ log_write $PLUGIN_LOG_FILE "Excluding non ASCII file" fi log_write $PLUGIN_LOG_FILE + if ((PLUGIN_ERROR)); then echolog Error + elif ((PLUGIN_SKIP)); then + echolog Skipped else echolog Done fi @@ -3248,6 +3282,7 @@ slert_info update_info test $SLES_VER -lt 110 && update_d_info + smt_info novell_edir_info novell_lum_info novell_ncp_info diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportconfig.conf new/supportutils-1.01/supportconfig.conf --- old/supportutils-1.01/supportconfig.conf 2008-10-16 22:36:30.000000000 +0200 +++ new/supportutils-1.01/supportconfig.conf 2008-10-23 17:47:55.000000000 +0200 @@ -40,6 +40,7 @@ OPTION_SLP=1 OPTION_SMART=0 OPTION_SMB=1 +OPTION_SMT=1 OPTION_SRAID=1 OPTION_SSH=1 OPTION_SYSCONFIG=1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportconfig.conf.5 new/supportutils-1.01/supportconfig.conf.5 --- old/supportutils-1.01/supportconfig.conf.5 2008-10-16 22:36:30.000000000 +0200 +++ new/supportutils-1.01/supportconfig.conf.5 2008-10-23 17:47:55.000000000 +0200 @@ -1,4 +1,4 @@ -.TH supportconfig.conf "5" "13 Oct 2008" "supportconfig.conf" "Support Utilities Manual" +.TH supportconfig.conf "5" "17 Oct 2008" "supportconfig.conf" "Support Utilities Manual" .SH NAME supportconfig.conf \- .BR supportconfig (1) @@ -131,6 +131,9 @@ OPTION_SMB Samba and CIFS related information. \fBsamba.txt\fR (1) .TP +OPTION_SMT +Subscription Management Tool (SMT) related information. \fBsmt.txt\fR (1) +.TP OPTION_SRAID Software RAID related information. \fBfs-softraid.txt\fR (1) .TP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportutils.changes new/supportutils-1.01/supportutils.changes --- old/supportutils-1.01/supportutils.changes 2008-10-16 22:36:30.000000000 +0200 +++ new/supportutils-1.01/supportutils.changes 2008-10-23 17:47:55.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Oct 17 14:38:25 MDT 2008 - jrecord@novell.com + +-added plugin skipped (bnc#436655) +-added timed_log_cmd to plugins (bnc#436624) +-fixed executible plugin check (bnc#436625) +-added SMT support in smt.txt (bnc#436627) + +------------------------------------------------------------------- Thu Oct 16 13:29:56 MDT 2008 - jrecord@novell.com -SLES10 now includes infiniband probe diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportutils.spec new/supportutils-1.01/supportutils.spec --- old/supportutils-1.01/supportutils.spec 2008-10-16 22:36:30.000000000 +0200 +++ new/supportutils-1.01/supportutils.spec 2008-10-23 17:47:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package supportutils (Version 1.01.18) +# spec file for package supportutils (Version 1.01.19) # # Copyright (C) 2008 Novell, Inc. # This file and all modifications and additions to the pristine @@ -18,7 +18,7 @@ Group: System/Management Autoreqprov: on Version: 1.01 -Release: 18 +Release: 19 Source: %{name}-%{version}.tar.gz Summary: Support Troubleshooting Tools BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org