r55950 - in /scripts: patchedit t/patchedit/no-meta.ok-o t/patchedit/no-meta2.ok-o

[jozef-guest at users.alioth.debian.org]

Author: jozef-guest
Date: Sun Apr 11 13:42:26 2010
New Revision: 55950

URL: http://svn.debian.org/wsvn/?sc=1&rev=55950
Log:
Author or From, Reviewed-by or Acked-by

Modified:
    scripts/patchedit
    scripts/t/patchedit/no-meta.ok-o
    scripts/t/patchedit/no-meta2.ok-o

Modified: scripts/patchedit
URL: http://svn.debian.org/wsvn/scripts/patchedit?rev=55950&op=diff
==============================================================================
--- scripts/patchedit (original)
+++ scripts/patchedit Sun Apr 11 13:42:26 2010
@@ -176,7 +176,10 @@
 			unless scalar (grep { m/Bug-?/ } keys %{$patch_content});
 
 		$patch_content->{'Forwarded'} ||= "*** FIXME ***\n";
-		$patch_content->{'Reviewed-by'} ||= "*** FIXME ***\n";
+		$patch_content->{'Author'} ||= "*** FIXME ***\n"
+			unless $patch_content->{'Author'} || $patch_content->{'From'};
+		$patch_content->{'Reviewed-by'} ||= "*** FIXME ***\n"
+			unless $patch_content->{'Reviewed-by'} || $patch_content->{'Acked-by'};
 		$patch_content->{'Last-Update'} ||= DateTime->now->set_time_zone('local')->strftime('%Y-%m-%d')."\n";
 	}
 	
@@ -214,11 +217,12 @@
 	if ($also_optional) {
 		$tb->ok(scalar (grep { m/Bug-?/ } keys %{$patch_content}), 'has Bug or Bug-???');		
 		$tb->ok($patch_content->{'Forwarded'}, 'has Forwarded');
+		$tb->ok($patch_content->{'Author'} || $patch_content->{'From'}, 'has Author or From');
 		$tb->ok($patch_content->{'Reviewed-by'} || $patch_content->{'Acked-by'}, 'has Reviewed-by or Acked-by');
 		$tb->ok($patch_content->{'Last-Update'}, 'has Last-Update');
 	}
 	else {
-		$tb->skip('skipping optional') foreach (1..4);
+		$tb->skip('skipping optional') foreach (1..5);
 	}
 	my @extra_fields = 
 		grep { $_ ne '_patch' }       # _patch is ok

Modified: scripts/t/patchedit/no-meta.ok-o
URL: http://svn.debian.org/wsvn/scripts/t/patchedit/no-meta.ok-o?rev=55950&op=diff
==============================================================================
--- scripts/t/patchedit/no-meta.ok-o (original)
+++ scripts/t/patchedit/no-meta.ok-o Sun Apr 11 13:42:26 2010
@@ -2,6 +2,7 @@
 Origin: *** FIXME ***
 Bug: *** FIXME ***
 Forwarded: *** FIXME ***
+Author: *** FIXME ***
 Reviewed-by: *** FIXME ***
 Last-Update: 2004-02-02
 

Modified: scripts/t/patchedit/no-meta2.ok-o
URL: http://svn.debian.org/wsvn/scripts/t/patchedit/no-meta2.ok-o?rev=55950&op=diff
==============================================================================
--- scripts/t/patchedit/no-meta2.ok-o (original)
+++ scripts/t/patchedit/no-meta2.ok-o Sun Apr 11 13:42:26 2010
@@ -2,6 +2,7 @@
 Origin: *** FIXME ***
 Bug: *** FIXME ***
 Forwarded: *** FIXME ***
+Author: *** FIXME ***
 Reviewed-by: *** FIXME ***
 Last-Update: 2004-02-02