Attachment 153180 Details for Bug 197607 – p5-PatchReader Update

[patch] p5-PatchReader Update

patchreader.diff (text/plain), 1.67 KB, created by Marcus von Appen on 2015-02-19 16:22:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus von Appen

Created: 2015-02-19 16:22:34 UTC

Size: 1.67 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 378632)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	PatchReader
> PORTVERSION=	0.9.6
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel perl5
> MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:TMANNERM
>Index: files/patch-lib__PatchReader__Raw.pm
>===================================================================
>--- files/patch-lib__PatchReader__Raw.pm	(revision 378632)
>+++ files/patch-lib__PatchReader__Raw.pm	(working copy)
>@@ -1,8 +1,26 @@
>---- lib/PatchReader/Raw.pm.orig	2014-09-20 06:54:09 UTC
>+--- lib/PatchReader/Raw.pm.orig	2015-02-19 16:02:48 UTC
> +++ lib/PatchReader/Raw.pm
>-@@ -41,7 +41,7 @@
>+@@ -40,8 +40,25 @@ sub next_line {
>+ 
>    return if $line =~ /^\?/;
>  
>++  # FreeBSD bug #197607 - svn property changes are
>++  # displayed as line additions in Bugzilla. We'll
>++  # just ignore the whole property section.
>++  if ($this->{in_prop} == 1) {
>++      if ($line =~ /^Index:\s*([\S ]+)/) {
>++          # End of property changes, continue normally.
>++          $this->{in_prop} = 0;
>++      } else {
>++          # Ignore property lines
>++          return;
>++      }
>++  } elsif ($line =~ /^Property changes on:.*$/) {
>++      # SVN property changes, skip everything until the next index...
>++      $this->{in_prop} = 1;
>++      return;
>++  }
>++
>    # patch header parsing
> -  if ($line =~ /^---\s*([\S ]+)\s*\t([^\t\r\n]*)\s*(\S*)/) {
> +  if ($line =~ /^---\s+([\S ]+)\s*?(?:\t([^\t\r\n]*)\s*(\S*))?/) {
>@@ -9,7 +27,7 @@
>      $this->_maybe_end_file();
>  
>      if ($1 eq "/dev/null") {
>-@@ -54,9 +54,11 @@
>+@@ -54,9 +71,11 @@ sub next_line {
>  
>      $this->{IN_HEADER} = 1;
>

Actions: View | Diff

Attachments on bug 197607: 153180