From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Tue, 8 Mar 2011 10:20:23 +0000 (+0000)
Subject: No explicit writing in ChangeLog when there's no version change.
X-Git-Tag: glite-lb-server_R_2_2_3_1~5
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=5ec0e51faedb8b66f1765366606a7d2f8077bfb0;p=jra1mw.git

No explicit writing in ChangeLog when there's no version change.
---

diff --git a/org.glite.lb/etics-tag.pl b/org.glite.lb/etics-tag.pl
index 4010c47..7f611f6 100755
--- a/org.glite.lb/etics-tag.pl
+++ b/org.glite.lb/etics-tag.pl
@@ -221,17 +221,15 @@ usage: $0 [-i maj|min|rev|age|none|<sigle_word_age>] [-g] [-c <current configura
 
 		system("cp $module/project/ChangeLog $tmpChangeLog");
 
-		unless ($increment eq "n") {system("echo $major.$minor.$revision-$age >> $tmpChangeLog");}
-
-		if ($increment eq "a") {system("echo \"- Module rebuilt\" >> $tmpChangeLog"); system("echo \"\" >> $tmpChangeLog");}
-		else { system("cvs log -S -N -r" . "$current_tag" . ":: $module | egrep -v \"^locks:|^access list:|^keyword substitution:|^total revisions:|^branch:|^description:|^head:|^RCS file:|^date:|^---|^===|^revision \" >> $tmpChangeLog"); }
-
-		$ChangeLogRet=system("vim $tmpChangeLog");
+		unless ($increment eq "n") {system("echo $major.$minor.$revision-$age >> $tmpChangeLog");
+			if ($increment eq "a") {system("echo \"- Module rebuilt\" >> $tmpChangeLog"); system("echo \"\" >> $tmpChangeLog");}
+			else { system("cvs log -S -N -r" . "$current_tag" . ":: $module | egrep -v \"^locks:|^access list:|^keyword substitution:|^total revisions:|^branch:|^description:|^head:|^RCS file:|^date:|^---|^===|^revision \" >> $tmpChangeLog"); }
 
+			$ChangeLogRet=system("vim $tmpChangeLog");
+		}
 		printf("Modified ChangeLog ready, ret code: $ChangeLogRet\n");
 
 		printf(EXEC "#Update the ChangeLog\ncp $tmpChangeLog $module/project/ChangeLog\n\n");
-
 	}	
 
 	unless ($increment eq "n") {