Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2014-07-11 20:06:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh"
Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2014-07-02
15:05:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-07-11
20:06:08.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jul 2 12:42:22 UTC 2014 - kgronl...@suse.com
+
+- Low: hb_report: combine-logs.pl is obsolete
+- upstream: 2.1.0-6-g52f6af222dcb
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.zigjEq/_old 2014-07-11 20:06:09.000000000 +0200
+++ /var/tmp/diff_new_pack.zigjEq/_new 2014-07-11 20:06:09.000000000 +0200
@@ -41,7 +41,7 @@
Summary: High Availability cluster command-line interface
License: GPL-2.0+
Group: %{pkg_group}
-Version: 2.1+git4
+Version: 2.1+git6
Release: %{?crmsh_release}%{?dist}
Url: http://crmsh.github.io
Source0: crmsh.tar.bz2
++++++ crmsh.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh/hb_report/Makefile.am
new/crmsh/hb_report/Makefile.am
--- old/crmsh/hb_report/Makefile.am 2014-06-30 12:58:11.000000000 +0200
+++ new/crmsh/hb_report/Makefile.am 2014-07-02 12:51:37.000000000 +0200
@@ -20,6 +20,6 @@
MAINTAINERCLEANFILES = Makefile.in
hanoarchdir = $(datadir)/@PACKAGE@
hanoarch_DATA = utillib.sh ha_cf_support.sh openais_conf_support.sh
-hanoarch_SCRIPTS = combine-logs.pl hb_report
+hanoarch_SCRIPTS = hb_report
EXTRA_DIST = $(hanoarch_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh/hb_report/combine-logs.pl
new/crmsh/hb_report/combine-logs.pl
--- old/crmsh/hb_report/combine-logs.pl 2014-06-30 12:58:11.000000000 +0200
+++ new/crmsh/hb_report/combine-logs.pl 1970-01-01 01:00:00.000000000 +0100
@@ -1,136 +0,0 @@
-#!/usr/bin/perl
-#
-# combine-logs v1.0
-#
-# Copyright (c) 1999 Steven J. Madsen. All rights reserved.
-#
-# Combines multiple syslog-format logs into a single chronological log. Very
-# handy for syslog report generators such as cksyslog.
-#
-# usage: combine-logs <log file> [...]
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
-#
-# Note by Dejan Muhamedagic <de...@suse.de>
-#
-# This program was downloaded from
-# http://www.moonglade.com/syslog/combine-logs-1.0.tar.gz
-#
-
-$debugging = 0;
-
-# Open all of the logs.
-$handle = "fh00";
-foreach $file (@ARGV)
-{
- $handle++;
- open $handle, $file || die "Could not open $file: $!\n";
- push @fh, $handle;
-}
-
-# Get the first line from each of the files.
-$i = 0;
-foreach $handle (@fh)
-{
- $current_line[$i++] = get_next_line($handle);
-}
-
-# Process the logs.
-while (1)
-{
- $first = 0;
- for ($i = 1; $i < @fh; $i++)
- {
- if (first_entry($current_line[$first], $current_line[$i]))
- {
- $first = $i;
- }
- }
- # Fall out if the entry isn't defined (no more entries to print).
- last if !defined($current_line[$first]);
-
- # Print the entry and get the next line from that log.
- print $current_line[$first];
- $current_line[$first] = get_next_line($fh[$first]);
-}
-
-# Gets the next line from the provided file handle.
-sub get_next_line()
-{
- my($handle) = @_;
- my($line);
- while ($line = <$handle>)
- {
- print " read $line" if $debugging;
-
- # Weed out useless "last message repeated" messages.
- next if $line =~ m/last message repeated \d+ times$/;
-
- # Fall out if the line passes the above tests.
- last;
- }
- return $line;
-}
-
-# Determines which syslog-style log entry comes first. If $a comes first,
-# the function returns 0. If $b comes first, the function returns 1.
-sub first_entry()
-{
- my($a, $b) = @_;
- print " \$a=$a \$b=$b" if $debugging;
- return 0 if !defined($b);
- return 1 if !defined($a);
-
- my(%month) = (Jan => 0, Feb => 1, Mar => 2, Apr => 3, May => 4, Jun => 5,
- Jul => 6, Aug => 7, Sep => 8, Oct => 9, Nov => 10, Dec => 11);
- my($a_month, $a_day, $a_hour, $a_minute, $a_second) =
- $a =~ /^(\w+)\s+(\d+)\s+(\d+):(\d+):(\d+)\s/;
- my($b_month, $b_day, $b_hour, $b_minute, $b_second) =
- $b =~ /^(\w+)\s+(\d+)\s+(\d+):(\d+):(\d+)\s/;
-
- print " a: $a_month $a_day $a_hour:$a_minute:$a_second\n" if $debugging;
- print " b: $b_month $b_day $b_hour:$b_minute:$b_second\n" if $debugging;
-
- # Strictly speaking, Jan comes before Dec, but in the case that we are
- # comparing exactly those two, we consider Jan to come later. In the
- # context of a log, this probably means a new year.
- return 0 if $a_month eq "Dec" && $b_month eq "Jan";
- return 1 if $a_month eq "Jan" && $b_month eq "Dec";
-
- # All other comparisons are as you'd expect.
- if ($a_month ne $b_month)
- {
- return $month{$a_month} > $month{$b_month};
- }
- if ($a_day ne $b_day)
- {
- return $a_day > $b_day;
- }
- if ($a_hour ne $b_hour)
- {
- return $a_hour > $b_hour;
- }
- if ($a_minute ne $b_minute)
- {
- return $a_minute > $b_minute;
- }
- if ($a_second ne $b_second)
- {
- return $a_second > $b_second;
- }
-
- # They have identical times, so just pick the first one.
- return 0;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh/hb_report/hb_report.in
new/crmsh/hb_report/hb_report.in
--- old/crmsh/hb_report/hb_report.in 2014-06-30 12:58:11.000000000 +0200
+++ new/crmsh/hb_report/hb_report.in 2014-07-02 12:51:37.000000000 +0200
@@ -973,24 +973,6 @@
}
#
-# if there is no central log, let's combine logs from individual
-# nodes; the ordering may not be perfect, but then centralized
-# logging doesn't guarantee the order of messages either
-# (network delay, machine load)
-#
-combine_logs() {
- local destdir
- destdir=$1
- test $NODECNT -gt 1 ||
- return
- test -x $HA_NOARCHBIN/combine-logs.pl ||
- warning "cannot combine logs: no $HA_NOARCHBIN/combine-logs.pl"
- $HA_NOARCHBIN/combine-logs.pl $destdir/*/$HALOG_F > $destdir/$HALOG_F
- loginfo $destdir/$HALOG_F combined > $destdir/$HALOG_F.info
- $HA_NOARCHBIN/combine-logs.pl $destdir/*/events.txt >
$destdir/events.txt
-}
-
-#
# description template, editing, and other notes
#
mktemplate() {
@@ -1439,8 +1421,6 @@
read junk
edittemplate $WORKDIR/$DESCRIPTION_F
}
- test -f $WORKDIR/$HALOG_F ||
- combine_logs $WORKDIR
wait
if [ "$COMPRESS" = "1" ]; then
pickcompress
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
