r55949 - /scripts/patchedit

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

Author: jozef-guest
Date: Sun Apr 11 13:42:07 2010
New Revision: 55949

URL: http://svn.debian.org/wsvn/?sc=1&rev=55949
Log:
Description or Subject

Modified:
    scripts/patchedit

Modified: scripts/patchedit
URL: http://svn.debian.org/wsvn/scripts/patchedit?rev=55949&op=diff
==============================================================================
--- scripts/patchedit (original)
+++ scripts/patchedit Sun Apr 11 13:42:07 2010
@@ -166,7 +166,8 @@
 	my $also_optional = shift;
 	
 	my $patch_content = _read_patch($patch);
-	$patch_content->{'Description'} ||= "*** FIXME ***\n";
+	$patch_content->{'Description'} = "*** FIXME ***\n"
+		unless $patch_content->{'Description'} || $patch_content->{'Subject'};
 	$patch_content->{'Origin'} = "*** FIXME ***\n"
 		unless $patch_content->{'Origin'} || $patch_content->{'Author'};
 
@@ -208,7 +209,7 @@
 	my $patch_content = _read_patch($patch);
 	my $tb = Test::Builder->new;
 	$tb->plan('tests' => 7);
-	$tb->ok($patch_content->{'Description'}, 'has Description');
+	$tb->ok($patch_content->{'Description'} || $patch_content->{'Subject'}, 'has Description or Subject');
 	$tb->ok($patch_content->{'Origin'} || $patch_content->{'Author'}, 'has Origin or Author');
 	if ($also_optional) {
 		$tb->ok(scalar (grep { m/Bug-?/ } keys %{$patch_content}), 'has Bug or Bug-???');