[SQL-CVS] SQLObject development repository branch master updated. 3.2.0-52-gf09ab7a

[Oleg B. <no...@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  f09ab7a6c734672d50df14e8d3f364c458eb3ce5 (commit)
      from  f53f3383be434b1d0f10e2e8bc05973872dd3101 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/f09ab7a6c734672d50df14e8d3f364c458eb3ce5

commit f09ab7a6c734672d50df14e8d3f364c458eb3ce5
Author: Oleg Broytman <ph...@ph...>
Date:   Tue May 2 22:11:15 2017 +0300

    Fix split.sh: recognize both 'c' and 'rc'
    
    [skip ci]

diff --git a/devscripts/split.sh b/devscripts/split.sh
index 9ae68ab..ce5c3c5 100644
--- a/devscripts/split.sh
+++ b/devscripts/split.sh
@@ -1,6 +1,6 @@
 split_tag() {
    branch=$2
-   set -- `echo $1 | sed -e 's/\./ /g' -e 's/a/ alpha /' -e 's/b/ beta /' -e 's/c/ rc /'`
+   set -- `echo $1 | sed -e 's/\./ /g' -e 's/a/ alpha /' -e 's/b/ beta /' -e 's/rc/ rc /' -e 's/\([0-9]\)c/\1 rc /'`
    major=$1
    minor=$2
    micro=$3
diff --git a/devscripts/test-split.sh b/devscripts/test-split.sh
index 6919f57..a5f1749 100755
--- a/devscripts/test-split.sh
+++ b/devscripts/test-split.sh
@@ -1,7 +1,6 @@
 #! /bin/sh
 
 . `dirname $0`/split.sh &&
-split_tag 21.12.42c4
 
 test_eq() {
    if [ "$1" != "$2" ]; then
@@ -9,6 +8,15 @@ test_eq() {
    fi
 }
 
+split_tag 21.12.42c4
+test_eq "$branch" 21.12
+test_eq "$major" 21
+test_eq "$minor" 12
+test_eq "$micro" 42
+test_eq "$state" "release candidate"
+test_eq "$serial" 4
+
+split_tag 21.12.42rc4
 test_eq "$branch" 21.12
 test_eq "$major" 21
 test_eq "$minor" 12

-----------------------------------------------------------------------

Summary of changes:
 devscripts/split.sh      |  2 +-
 devscripts/test-split.sh | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
SQLObject development repository