W załączniku patch na amtoc: zmiana SUCCESS|CHUNK taper na PART taper Dobrze zrobiłem?
-- Pozdrawiam, Marek Marczykowski | gg:2873965 marmarek at staszic waw pl | xmpp:marmarek at staszic waw pl
Index: amanda.spec
===================================================================
RCS file: /cvsroot/SPECS/amanda.spec,v
retrieving revision 1.180
diff -u -r1.180 amanda.spec
--- amanda.spec 21 May 2008 13:36:37 -0000 1.180
+++ amanda.spec 27 Oct 2008 18:02:20 -0000
@@ -29,6 +29,7 @@
Patch6: %{name}-FHS.patch
Patch7: %{name}-no-buildtime-ipv6.patch
Patch8: %{name}-heimdal.patch
+Patch9: %{name}-amtoc.patch
URL: http://www.amanda.org/
BuildRequires: autoconf >= 2.53
BuildRequires: automake
@@ -180,6 +181,7 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p0
%build
%{__aclocal} -I config -I config/gettext-macros -I config/gnulib -I
config/amanda -I config/macro-archive
--- ./server-src/amtoc.pl.orig 2008-10-26 15:21:44.691836813 +0100
+++ ./server-src/amtoc.pl 2008-10-26 15:32:17.076007801 +0100
@@ -191,10 +191,14 @@
&pr("#","Server","/partition","date", "level","size[Kb]","part");
&pr("$filenumber","$chunk","","$disk","-","-","-");
last switch; };
- /^(?:SUCCESS|CHUNK) taper/ && do {
- if(/SUCCESS/){
- $level = $chunk;
- $chunk = "-";
+ /^(?:PART) taper/ && do {
+ if(/PART/){
+ /^([A-Z]+) taper (\S+) (\S+) (\S+) (\S+) (\S+) (\S+) (\S+)/;
+ $host = $4;
+ $disk = $5;
+ $date = $6;
+ $chunk = $7;
+ $level = $8;
}
$mysize = 0;
if(/ kb (\d+) /){
@@ -206,11 +210,11 @@
if (defined($flash_mode)) {
&pr("$filenumber","${host}","${disk}","${date}","${level}","$mysize","${chunk}");
} else {
- if (defined($osize{$host}{$disk}) && !/^CHUNK/) {
+ if (defined($osize{$host}{$disk}) && !/^PART/) {
&pr("$filenumber","${host}","${disk}","${date}","${level}","$osize{$host}{$disk}","${chunk}");
} else {
$note = "";
- if(!/^CHUNK/){
+ if(!/^PART/){
# this case should never happend:
$strange=1;
$note = "*";
pgpcA2bHsbAGj.pgp
Description: PGP signature
_______________________________________________ pld-devel-pl mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
