From: Vincent Pit Date: Tue, 18 Sep 2012 20:34:52 +0000 (+0200) Subject: Reset revision numbering when a new target version is available X-Git-Tag: v0.940.0~3 X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FTask-Devel-Cover-Recommended.git;a=commitdiff_plain;h=34c4d581c4a18d0befc0cbaa87fd56e63ddf50b7 Reset revision numbering when a new target version is available --- diff --git a/samples/generate.pl b/samples/generate.pl index 456c659..521483f 100644 --- a/samples/generate.pl +++ b/samples/generate.pl @@ -155,20 +155,28 @@ if (-e $task_file) { } close $old_fh; } -my ($old_task_revision) = $old_task_version =~ /([0-9]+)$/; -my $new_task_version = version->parse($target_version)->normal; -my $new_task_revision = $old_task_revision; -if (!$opts{n} - and version->parse($new_task_version) <= version->parse($old_task_version)) { - ++$new_task_revision; -} -if (($target_version =~ tr/.//) < 2) { - my @components = split /\./, $new_task_version; - $components[2] = $new_task_revision; - $new_task_version = join '.', @components; +my $new_task_version; + +if ($opts{n}) { + $new_task_version = $old_task_version; } else { - $new_task_version .= ".$new_task_revision"; + my ($old_target_version, $old_task_revision) + = $old_task_version =~ /(.*)\.([0-9]+)$/; + my $new_task_revision; + if (version->parse($target_version) > version->parse($old_target_version)) { + $new_task_revision = 0; + } else { + $new_task_revision = $old_task_revision + 1; + } + $new_task_version = version->parse($target_version)->normal; + if (($target_version =~ tr/.//) < 2) { + my @components = split /\./, $new_task_version; + $components[2] = $new_task_revision; + $new_task_version = join '.', @components; + } else { + $new_task_version .= ".$new_task_revision"; + } } (my $bug_queue = $task_pkg) =~ s/::/-/g;