tests: Do not check release suffix in ctdb version test
authorAmitay Isaacs <amitay@gmail.com>
Wed, 31 Oct 2012 01:10:22 +0000 (12:10 +1100)
committerAmitay Isaacs <amitay@gmail.com>
Wed, 31 Oct 2012 01:19:03 +0000 (12:19 +1100)
release suffix added by RPM is to track packaging changes. Core CTDB
version does not include the release suffix.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
tests/simple/01_ctdb_version.sh

index 5a36ea49eb57f3bbc06e0de95ea98d7fc1f5b90d..3e1ed3e7646b59cd827a4ac56a0592e7003b2d2d 100755 (executable)
@@ -39,8 +39,9 @@ if ! try_command_on_node -v 0 "rpm -q ctdb" ; then
 fi
 rpm_ver="${out#ctdb-}"
 # Some version of RPM append the architecture to the version.
+# And also remove the release suffix.
 arch=$(uname -m)
-rpm_ver="${rpm_ver%.${arch}}"
+rpm_ver="${rpm_ver%-*.${arch}}"
 
 try_command_on_node -v 0 "$CTDB version"
 ctdb_ver="${out#CTDB version: }"