From 8d88a842da58a7689c16e9529a000cb5267320ba Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Fri, 24 Jun 2011 14:09:20 -0700 Subject: [PATCH] tools/release: Handle v1.0.0.201106090707-r-NN-gdeadbeef The 1.0.0 release tags have a new suffix. Account for this. Change-Id: Ic6f260b6a5ba353af3b312b722f576155208eaa0 Signed-off-by: Shawn O. Pearce --- tools/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/version.sh b/tools/version.sh index 1ed6c01b6..2fae5e142 100755 --- a/tools/version.sh +++ b/tools/version.sh @@ -82,7 +82,7 @@ case "$V" in *-[1-9]*-g[0-9a-f]*) POM_V=$(echo "$V" | perl -pe 's/-(\d+-g.*)$/.$1/') OSGI_V=$(perl -e ' - $ARGV[0] =~ /^(\d+)(?:\.(\d+)(?:\.(\d+))?)?-(\d+)-g(.*)$/; + die unless $ARGV[0] =~ /^(\d+)(?:\.(\d+)(?:\.(\d+))?(?:\.\d{12}-r)?)?-(\d+)-g(.*)$/; my ($a, $b, $c, $p, $r) = ($1, $2, $3, $4, $5); $b = '0' unless defined $b; $c = '0' unless defined $c;