From 6d63e4b64cf206a58e738e868e88afd7acee8346 Mon Sep 17 00:00:00 2001 From: Jephte CLAIN Date: Mon, 7 Jul 2014 15:45:14 +0400 Subject: [PATCH] support des versions de l'AMUE du style 450lz2 --- ulib/.ulib_version | 2 +- ulib/base | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ulib/.ulib_version b/ulib/.ulib_version index 87523dd..d81cc07 100644 --- a/ulib/.ulib_version +++ b/ulib/.ulib_version @@ -1 +1 @@ -41 +42 diff --git a/ulib/base b/ulib/base index f876d3b..4a66105 100644 --- a/ulib/base +++ b/ulib/base @@ -1739,7 +1739,7 @@ function get_archive_appname() { print substr($0, 1, RSTART - 1) } else if (match($0, /([0-9]+([-_.][0-9]+)*([a-zA-Z][0-9]*|[-_.][0-9]+[a-zA-Z][0-9]*)?)$/)) { print substr($0, 1, RSTART - 1) - } else if (match($0, /([0-9]+[a-z][a-z][a-z]?)$/, vs)) { + } else if (match($0, /([0-9]+[a-z][a-z][a-z0-9]?)$/, vs)) { # version style AMUE, e.g. 430la print substr($0, 1, RSTART - 1) } else { @@ -1758,7 +1758,7 @@ function get_archive_versionsuffix() { print vs["1"] } else if (match($0, /([0-9]+([-_.][0-9]+)*([a-zA-Z][0-9]*|[-_.][0-9]+[a-zA-Z][0-9]*)?)$/, vs)) { print vs["1"] - } else if (match($0, /([0-9]+[a-z][a-z][a-z]?)$/, vs)) { + } else if (match($0, /([0-9]+[a-z][a-z][a-z0-9]?)$/, vs)) { # version style AMUE, e.g. 430la print vs["1"] } @@ -1775,7 +1775,7 @@ function get_archive_version() { print vs["1"] } else if (match($0, /([0-9]+([-_.][0-9]+)*([a-zA-Z][0-9]*|[-_.][0-9]+[a-zA-Z][0-9]*)?)$/, vs)) { print vs["1"] - } else if (match($0, /([0-9]+[a-z][a-z][a-z]?)$/, vs)) { + } else if (match($0, /([0-9]+[a-z][a-z][a-z0-9]?)$/, vs)) { # version style AMUE, e.g. 430la print vs["1"] }