Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2013-01-07 15:02:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh", Maintainer is "DMuhamedagic@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2012-12-28 14:56:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2013-01-07 15:02:18.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Dec 27 14:49:32 UTC 2012 - dmuhamedagic@suse.com + +- history: update completion lists for transition +- history: add one node log pattern +- history: add date to the long peinputs listing +- upstream cs: bf5c9a8b3e87 (v1.2.4 really) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt --- old/crmsh/.hg_archival.txt 2012-12-19 13:36:50.000000000 +0100 +++ new/crmsh/.hg_archival.txt 2012-12-24 15:53:28.000000000 +0100 @@ -1,5 +1,5 @@ repo: 13c3bd69e935090cd25213c474cafc3f01b5910b -node: 7c09f05419e6d3a5abfef3afdfe92053a83cec8e +node: bf5c9a8b3e8739e01f6bbe72064b17c94288480b branch: default -latesttag: crmsh-1.2.3 -latesttagdistance: 20 +latesttag: crmsh-1.2.4 +latesttagdistance: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/.hgtags new/crmsh/.hgtags --- old/crmsh/.hgtags 2012-12-19 13:36:50.000000000 +0100 +++ new/crmsh/.hgtags 2012-12-24 15:53:28.000000000 +0100 @@ -21,3 +21,4 @@ b6bb311c7bd36c05206f3a1cd98193ccf46d8da0 crmsh-1.2.1 4ca0d2abf345d207a5fbdbc444d70d8b18b0cc6a crmsh-1.2.2 fe29639e39eb95b2d806f0567e6e0b6cf1070e96 crmsh-1.2.3 +51379136d6928d8ef5c6f24eec330794a6d265a3 crmsh-1.2.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/completion.py new/crmsh/modules/completion.py --- old/crmsh/modules/completion.py 2012-12-19 13:36:50.000000000 +0100 +++ new/crmsh/modules/completion.py 2012-12-24 15:53:28.000000000 +0100 @@ -180,7 +180,7 @@ def report_pe_list_transition(idx,delimiter = False): if delimiter: return ' ' - return crm_report.peinputs_list() + ["showdot"] + return crm_report.peinputs_list() + ["log", "showdot", "save"] def report_pe_list_peinputs(idx,delimiter = False): if delimiter: return ' ' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/log_patterns.py new/crmsh/modules/log_patterns.py --- old/crmsh/modules/log_patterns.py 2012-12-19 13:36:50.000000000 +0100 +++ new/crmsh/modules/log_patterns.py 2012-12-24 15:53:28.000000000 +0100 @@ -52,6 +52,7 @@ "stonithd.*Succeeded.*node %%:", "pcmk_peer_update.*(lost|memb): %% ", "crmd.*ccm_event.*(NEW|LOST):.* %% ", + "Node return implies stonith of %% ", ), ( # detail 1 ), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/log_patterns_118.py new/crmsh/modules/log_patterns_118.py --- old/crmsh/modules/log_patterns_118.py 2012-12-19 13:36:50.000000000 +0100 +++ new/crmsh/modules/log_patterns_118.py 2012-12-24 15:53:28.000000000 +0100 @@ -50,6 +50,7 @@ "stonithd.*Succeeded.*node %%:", "pcmk_peer_update.*(lost|memb): %% ", "crmd.*ccm_event.*(NEW|LOST):.* %% ", + "Node return implies stonith of %% ", ), ( # detail 1 ), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/report.py new/crmsh/modules/report.py --- old/crmsh/modules/report.py 2012-12-19 13:36:50.000000000 +0100 +++ new/crmsh/modules/report.py 2012-12-24 15:53:28.000000000 +0100 @@ -1196,11 +1196,12 @@ return False self.show_logs(log_l = l) pe_details_header = \ -"Start End Filename Client User Origin" +"Date Start End Filename Client User Origin" pe_details_separator = \ -"===== === ======== ====== ==== ======" +"==== ===== === ======== ====== ==== ======" def pe_detail_format(self, t_obj): l = [ + shortdate(t_obj.start_ts), shorttime(t_obj.start_ts), t_obj.end_ts and shorttime(t_obj.end_ts) or "--:--:--", # the format string occurs also below @@ -1209,8 +1210,7 @@ l += get_cib_attributes(self.pe_report_path(t_obj), "cib", \ ("update-client", "update-user", "update-origin"), \ ("no-client", "no-user", "no-origin")) - return '%s - %s %-13s %-10s %-10s %s' % tuple(l) - #% (l2[0], l2[1], l2[2]) + return '%s %s %s %-13s %-10s %-10s %s' % tuple(l) def pelist(self, a=None, long=False): if not self.prepare_source(): return [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/utils.py new/crmsh/modules/utils.py --- old/crmsh/modules/utils.py 2012-12-19 13:36:50.000000000 +0100 +++ new/crmsh/modules/utils.py 2012-12-24 15:53:28.000000000 +0100 @@ -513,6 +513,8 @@ def shorttime(ts): return time.strftime("%X",time.localtime(ts)) +def shortdate(ts): + return time.strftime("%F",time.localtime(ts)) def sort_by_mtime(l): 'Sort a (small) list of files by time mod.' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/regression.sh new/crmsh/test/regression.sh --- old/crmsh/test/regression.sh 2012-12-19 13:36:50.000000000 +0100 +++ new/crmsh/test/regression.sh 2012-12-24 15:53:28.000000000 +0100 @@ -173,12 +173,17 @@ if [ "$a" -a -f "$TESTDIR/$a" ]; then testcase=$a runtestcase + elif echo "$a" | grep -q "^set:"; then + TESTSET=$TESTDIR/`echo $a | sed 's/set://'` + if [ -f "$TESTSET" ]; then + while read testcase; do + runtestcase + done < $TESTSET + else + echo "testset $TESTSET does not exist" >&3 + fi else - echo "$a" | grep -q "^set:" && - TESTSET=$TESTDIR/`echo $a | sed 's/set://'` - while read testcase; do - runtestcase - done < $TESTSET + echo "test $TESTDIR/$a does not exist" >&3 fi done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/BSC new/crmsh/test/testcases/BSC --- old/crmsh/test/testcases/BSC 2012-12-19 13:36:50.000000000 +0100 +++ new/crmsh/test/testcases/BSC 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -confbasic -confbasic-xml -acl -node -resource -file -shadow -ra -edit -commit -delete diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/Makefile.am new/crmsh/test/testcases/Makefile.am --- old/crmsh/test/testcases/Makefile.am 2012-12-19 13:36:50.000000000 +0100 +++ new/crmsh/test/testcases/Makefile.am 2012-12-24 15:53:28.000000000 +0100 @@ -20,7 +20,7 @@ testcasesdir = $(datadir)/$(PACKAGE)/tests/testcases testcases_SCRIPTS = ra.filter xmlonly.sh history.pre history.post -testcases_DATA = BSC basicset common.excl \ +testcases_DATA = basicset common.excl \ confbasic confbasic-xml delete file node ra resource shadow acl \ edit rset rset-xml history \ confbasic-xml.exp confbasic.exp delete.exp file.exp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/history.exp new/crmsh/test/testcases/history.exp --- old/crmsh/test/testcases/history.exp 2012-12-19 13:36:50.000000000 +0100 +++ new/crmsh/test/testcases/history.exp 2012-12-24 15:53:28.000000000 +0100 @@ -186,16 +186,16 @@ history-test/xen-e/pengine/pe-input-49.bz2 history-test/xen-e/pengine/pe-input-50.bz2 .INP: peinputs v -Start End Filename Client User Origin -===== === ======== ====== ==== ====== -20:06:57 - 20:06:57 pe-input-43 crmd hacluster xen-e -20:07:19 - 20:07:23 pe-input-44 cibadmin root xen-d -20:07:29 - 20:07:29 pe-input-45 cibadmin root xen-d -20:07:29 - 20:07:29 pe-input-46 cibadmin root xen-d -20:07:37 - 20:07:42 pe-input-48 cibadmin root xen-d -20:07:54 - 20:07:56 pe-warn-272 cibadmin root xen-d -20:07:56 - 20:07:57 pe-input-49 cibadmin root xen-d -20:08:43 - 20:08:43 pe-input-50 cibadmin root xen-d +Date Start End Filename Client User Origin +==== ===== === ======== ====== ==== ====== +2012-12-14 20:06:57 20:06:57 pe-input-43 crmd hacluster xen-e +2012-12-14 20:07:19 20:07:23 pe-input-44 cibadmin root xen-d +2012-12-14 20:07:29 20:07:29 pe-input-45 cibadmin root xen-d +2012-12-14 20:07:29 20:07:29 pe-input-46 cibadmin root xen-d +2012-12-14 20:07:37 20:07:42 pe-input-48 cibadmin root xen-d +2012-12-14 20:07:54 20:07:56 pe-warn-272 cibadmin root xen-d +2012-12-14 20:07:56 20:07:57 pe-input-49 cibadmin root xen-d +2012-12-14 20:08:43 20:08:43 pe-input-50 cibadmin root xen-d .INP: refresh INFO: 16: nothing to refresh if source isn't live .INP: resource d1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org