From 28b1044d9283f066243de0cc2c8406ff87ce8533 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Tue, 20 Jan 2009 17:31:37 +0000 Subject: [PATCH] fixes in version computation --- org.glite.lb/etics-tag-with-subsystems.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/org.glite.lb/etics-tag-with-subsystems.pl b/org.glite.lb/etics-tag-with-subsystems.pl index 7bcc5a9..57d737b 100755 --- a/org.glite.lb/etics-tag-with-subsystems.pl +++ b/org.glite.lb/etics-tag-with-subsystems.pl @@ -99,9 +99,9 @@ usage: $0 [-c ] module.name $old_major=-1; $old_minor=-1; $old_revision=-1; $old_age=-1; $new_major=-1; $new_minor=-1; $new_revision=-1; $new_age=-1; - foreach $l (`cvs diff -r glite-lb_R_$current_major\_$current_minor\_$current_revision\_$current_age $m/project/version.properties | grep -E "module\.age|module\.version"`) { + foreach $l (`cvs diff -r $current_prefix$current_major\_$current_minor\_$current_revision\_$current_age $m/project/version.properties | grep -E "module\.age|module\.version"`) { chomp($l); - #printf("$l\n"); + printf("$l\n"); if($l=~/<\s*module\.version\s*=\s*(\d*)\.(\d*)\.(\d*)/) { $old_major=$1; @@ -135,8 +135,8 @@ usage: $0 [-c ] module.name $increvision++; printf("Revision change ($old_revision -> $new_revision)"); } - elsif ($old_minor != $new_minor) { - $incminor++; + elsif ($old_age != $new_age) { + $incage++; printf("Age change ($old_age -> $new_age)"); } printf("\n"); @@ -168,7 +168,7 @@ usage: $0 [-c ] module.name $major=$current_major; $minor=$current_minor; $revision=$current_revision; - $age=1+1;} + $age=$current_age+1;} else { printf("No change in either version component.\nAbort by pressing Ctrl+C or enter new age manually.\nUse a number or a word: "); $major=$current_major; -- 1.8.2.3