[Po4a-commits] "po-debconf podebconf-report-po,1.59,1.60"

[Nicolas FRANCOIS]

Update of /cvsroot/po4a/po-debconf
In directory alioth:/tmp/cvs-serv31066

Modified Files:
	podebconf-report-po 
Log Message:
Keep the <package>, <version>, and <package_and_version> tags if they were
not filled. Closes: #481222


Index: podebconf-report-po
===================================================================
RCS file: /cvsroot/po4a/po-debconf/podebconf-report-po,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- podebconf-report-po	20 May 2008 21:31:25 -0000	1.59
+++ podebconf-report-po	20 May 2008 21:43:15 -0000	1.60
@@ -953,9 +953,10 @@
 	$BODY =~ s/<reply-to>/$BTS_ARG/g;
 	$BODY =~ s/\n# Reply-To: \n/\n/;
 	$BODY =~ s/<subject>/$SUBJECT/g;
-	$BODY =~ s/<package>/$PACKAGE_ARG/g;
-	$BODY =~ s/<version>/$PKG_VERSION/g;
-	$BODY =~ s/<package_and_version>/$PACKAGE_AND_VERSION/g;
+	$BODY =~ s/<package>/$PACKAGE_ARG/g if ($PACKAGE_ARG ne '');
+	$BODY =~ s/<version>/$PKG_VERSION/g if ($PKG_VERSION ne '');
+	$BODY =~ s/<package_and_version>/$PACKAGE_AND_VERSION/g
+		if ($PACKAGE_AND_VERSION ne '');
 	$BODY =~ s/<from>/$FROM_ARG/g;
 	$BODY =~ s/\n<deadline>/$DEADLINE_ARG/g;
 	$BODY =~ s/<statistics>\n/$statistics/g;