Attachment 12363 Details for Bug 6679 – Proposed patch to calm Jenkins

[patch] Proposed patch to calm Jenkins

0001-Bug-6679-Avoid-critic-failure-caused-by-ambiguous-co.patch (text/plain), 1.47 KB, created by Colin Campbell on 2012-09-19 16:30:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Campbell

Created: 2012-09-19 16:30:39 UTC

Size: 1.47 KB

patch

obsolete

>From 01cab2ca88f05a84ea87ec43bb6892e6d3ce4bde Mon Sep 17 00:00:00 2001
>From: Colin Campbell <colin.campbell@ptfs-europe.com>
>Date: Wed, 19 Sep 2012 17:23:27 +0100
>Subject: [PATCH] Bug 6679 Avoid critic failure caused by ambiguous code
>
>If countitems not set to 1 it was not being declared
>but is referred to outside this scope, generating
>runtime warnings and test failure
>---
> cataloguing/value_builder/marc21_linking_section.pl | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/cataloguing/value_builder/marc21_linking_section.pl b/cataloguing/value_builder/marc21_linking_section.pl
>index 275d3a5..f317f8b 100644
>--- a/cataloguing/value_builder/marc21_linking_section.pl
>+++ b/cataloguing/value_builder/marc21_linking_section.pl
>@@ -226,7 +226,7 @@ sub plugin {
>                       my $record = MARC::Record::new_from_usmarc( $results->[$i] );
>                   my $rechash = TransformMarcToKoha( $dbh, $record );
>                     my $pos;
>-                       my $countitems = 1 if ( $rechash->{itemnumber} );
>+                       my $countitems = $rechash->{itembumber} ? 1 : 0;
>                       while ( index( $rechash->{itemnumber}, '|', $pos ) > 0 ) {
>                              $countitems += 1;
>                               $pos = index( $rechash->{itemnumber}, '|', $pos ) + 1;
>@@ -406,4 +406,4 @@ sub plugin {
>       output_html_with_http_headers $query, $cookie, $template->output;
> }
> 
>-1;
>\ No newline at end of file
>+1;
>-- 
>1.7.12.464.g83379df
>

Actions: View | Diff | Splinter Review

Attachments on bug 6679: 4883 | 4884 | 4885 | 4886 | 4887 | 4888 | 5445 | 5446 | 5483 | 5487 | 6121 | 6122 | 6123 | 6139 | 6140 | 6141 | 6142 | 6143 | 6144 | 6270 | 6271 | 6663 | 6670 | 6675 | 6676 | 6677 | 6678 | 8542 | 8897 | 8898 | 8899 | 8950 | 8951 | 9746 | 9747 | 9748 | 9749 | 9750 | 10050 | 10051 | 10052 | 10053 | 10054 | 10075 | 10076 | 10077 | 10078 | 10079 | 10484 | 10485 | 10486 | 10487 | 10488 | 10489 | 10491 | 10492 | 10493 | 10494 | 10495 | 10496 | 10497 | 10499 | 10500 | 10501 | 10502 | 10503 | 10504 | 10505 | 10506 | 10507 | 10508 | 10509 | 10510 | 10512 | 10513 | 10514 | 10515 | 10517 | 10521 | 10522 | 10523 | 10524 | 10525 | 10526 | 10527 | 10935 | 10936 | 10938 | 10940 | 10944 | 10945 | 10946 | 10947 | 10948 | 10949 | 10950 | 10952 | 10953 | 10955 | 10957 | 10958 | 10959 | 10960 | 10961 | 10962 | 10963 | 10964 | 10965 | 10966 | 10967 | 10972 | 10976 | 10979 | 10980 | 10981 | 12224 | 12363 | 12490 | 12491 | 12492 | 34191 | 34192 | 34193 | 34194 | 34195 | 34196 | 34197 | 39100 | 39101 | 39102 | 39392 | 39393 | 39394 | 39395 | 39396 | 39397 | 39398 | 42770 | 47086 | 47087 | 47088 | 47089 | 47090 | 47178 | 47179 | 47180 | 47181 | 47205 | 47206 | 47207 | 47208