Hello community, here is the log from the commit of package cluster-glue for openSUSE:Factory checked in at 2014-07-10 08:16:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old) and /work/SRC/openSUSE:Factory/.cluster-glue.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cluster-glue" Changes: -------- --- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes 2014-06-26 10:42:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes 2014-07-10 08:16:49.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Jul 2 09:56:35 UTC 2014 - [email protected] + +- hb_report: remove obsolete combine-logs.pl +- upstream cs: 0abe35bebf5f + +------------------------------------------------------------------- +Wed Jun 25 14:37:40 UTC 2014 - [email protected] + +- Medium: hb_report: dot is not illegal in file names (bnc#884079, debian#715391) +- upstream cs: 0f48479c251b + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cluster-glue.spec ++++++ --- /var/tmp/diff_new_pack.5TRR2z/_old 2014-07-10 08:16:51.000000000 +0200 +++ /var/tmp/diff_new_pack.5TRR2z/_new 2014-07-10 08:16:51.000000000 +0200 @@ -261,7 +261,6 @@ %{_datadir}/%{name}/openais_conf_support.sh %{_datadir}/%{name}/utillib.sh %{_datadir}/%{name}/ha_log.sh -%{_datadir}/%{name}/combine-logs.pl %{_sbindir}/ha_logger %{_sbindir}/hb_report #%{_sbindir}/lrmadmin ++++++ cluster-glue.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/.hg_archival.txt new/cluster-glue/.hg_archival.txt --- old/cluster-glue/.hg_archival.txt 2014-06-25 14:47:30.000000000 +0200 +++ new/cluster-glue/.hg_archival.txt 2014-07-02 11:10:32.000000000 +0200 @@ -1,5 +1,5 @@ repo: e3ffdd7ae81c596b2be7e1e110d2c1255161340e -node: 0f48479c251beb5be75110e62c867970d71adc89 +node: 0abe35bebf5fd26c1efcd2bb8f796e697c8492fd branch: default latesttag: glue-1.0.12-rc1 -latesttagdistance: 22 +latesttagdistance: 23 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/cluster-glue-fedora.spec new/cluster-glue/cluster-glue-fedora.spec --- old/cluster-glue/cluster-glue-fedora.spec 2014-06-25 14:47:30.000000000 +0200 +++ new/cluster-glue/cluster-glue-fedora.spec 2014-07-02 11:10:32.000000000 +0200 @@ -128,7 +128,6 @@ %{_datadir}/%{name}/ha_cf_support.sh %{_datadir}/%{name}/openais_conf_support.sh %{_datadir}/%{name}/utillib.sh -%{_datadir}/%{name}/combine-logs.pl %{_datadir}/%{name}/ha_log.sh %{_sbindir}/ha_logger diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/cluster-glue-suse.spec new/cluster-glue/cluster-glue-suse.spec --- old/cluster-glue/cluster-glue-suse.spec 2014-06-25 14:47:30.000000000 +0200 +++ new/cluster-glue/cluster-glue-suse.spec 2014-07-02 11:10:32.000000000 +0200 @@ -230,7 +230,6 @@ %{_datadir}/%{name}/ha_cf_support.sh %{_datadir}/%{name}/openais_conf_support.sh %{_datadir}/%{name}/utillib.sh -%{_datadir}/%{name}/combine-logs.pl %{_datadir}/%{name}/ha_log.sh %{_sbindir}/ha_logger diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/hb_report/Makefile.am new/cluster-glue/hb_report/Makefile.am --- old/cluster-glue/hb_report/Makefile.am 2014-06-25 14:47:30.000000000 +0200 +++ new/cluster-glue/hb_report/Makefile.am 2014-07-02 11:10:32.000000000 +0200 @@ -21,7 +21,6 @@ hanoarchdir = $(datadir)/$(PACKAGE_NAME) -hanoarch_SCRIPTS = combine-logs.pl hanoarch_DATA = utillib.sh ha_cf_support.sh openais_conf_support.sh sbin_SCRIPTS = hb_report diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/hb_report/combine-logs.pl new/cluster-glue/hb_report/combine-logs.pl --- old/cluster-glue/hb_report/combine-logs.pl 2014-06-25 14:47:30.000000000 +0200 +++ new/cluster-glue/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 <[email protected]> -# -# 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/cluster-glue/hb_report/hb_report.in new/cluster-glue/hb_report/hb_report.in --- old/cluster-glue/hb_report/hb_report.in 2014-06-25 14:47:30.000000000 +0200 +++ new/cluster-glue/hb_report/hb_report.in 2014-07-02 11:10:32.000000000 +0200 @@ -976,24 +976,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() { @@ -1440,8 +1422,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: [email protected] For additional commands, e-mail: [email protected]
