Allow releases of the form <product>-<version> to use product.release.

Make releases more consistent with how they've always been.  If
there's no <product>-<version>.release file then look for
<product>.release and, if it exists, pass <version> to it.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/autocluster b/autocluster
index 4a3adad45a7a200f9cc7ceaab19b6ce338baaa59..296275359120f6e50bb56382e9c8ae7854338b3f 100755 (executable)
--- a/autocluster
+++ b/autocluster
@@ -1038,11 +1038,15 @@ with_release () {
     if [ -r "$f" ] ; then
        . "$f"
     else
-       echo "Unknown release \"${release}\" specified to --with-release"
-       printf "%-25s" "Supported releases are: "
-       # The 70 is lazy but it will do.
-       fill_text 25 "$(list_releases)"
-       exit 1
+       f="${installdir}/releases/${release%%-*}.release"
+       if [ -r "$f" ] ; then
+           . "$f" "${release#*-}"
+       else
+           echo "Unknown release \"${release}\" specified to --with-release"
+           printf "%-25s" "Supported releases are: "
+           fill_text 25 "$(list_releases)"
+           exit 1
+       fi
     fi
 
 }