fix increment release for backported releases

share/eterbuild/functions/spec

@@ -104,14 +104,26 @@ reset_release()
 	set_var $1 Release $RELEASE
 }
 
+# TODO: SS/DD (did not pass test)
+is_backported_release()
+{
+	echo "$1" | grep -E -q "\.(M[0-9][0-9][CPT]|SS|DD)\."
+}
+
 # inc 2 release to 3
 # textMAJOR.middle.MINOR
 inc_release()
 {
 	local BASERELEASE=$(get_numrelease "$1")
+	if is_backported_release "$BASERELEASE" ; then
+		local MAJOR="$(echo "$BASERELEASE" | sed -e "s|.*\.M[0-9][0-9][CPT]\.||")"
+		local m="$(echo "$BASERELEASE" | sed -e "s|$MAJOR$||")"
+		set_release "$1" "$(get_txtrelease "$1")$m$(($MAJOR + 1))"
+		return
+	fi
 	local MAJOR=`echo "$BASERELEASE" | sed -e "s|\..*||"`
 	local MINOR=`echo "$BASERELEASE" | sed -e "s|.*\.||"`
-	local m=$(echo "$BASERELEASE" | sed -e "s|$MAJOR\.\(.*\)\.$MINOR|\1|")
+	local m=$(echo "$BASERELEASE" | sed -e "s|$MAJOR\.\(.*\)\.$MINOR|\1|") #"
 	[ "$m" = "$BASERELEASE" ] && m=''
 	local am=''
 	# keep minor part
@@ -125,11 +137,12 @@ inc_release()
 # textMAJOR.middle.MINOR
 inc_subrelease()
 {
+	#is_backported_release
 	local BASERELEASE=$(get_numrelease $1)
 	local MAJOR=`echo "$BASERELEASE" | sed -e "s|\..*||"`
 	local MINOR=`echo "$BASERELEASE" | sed -e "s|.*\.||"`
 	[ "$MINOR" = "$BASERELEASE" ] && MINOR="0"
-	local m=$(echo "$BASERELEASE" | sed -e "s|$MAJOR\.\(.*\)\.$MINOR|\1|")
+	local m=$(echo "$BASERELEASE" | sed -e "s|$MAJOR\.\(.*\)\.$MINOR|\1|") #"
 	local am=''
 	# keep minor part
 	rhas "$MINOR" "[a-zA-Z]" && am=".$MINOR" && MINOR="0"

tests/increment_release.sh

@@ -73,8 +73,20 @@ check inc_release "alt4.git20130916" `inc_release ""`
 check inc_subrelease "alt3.git20130916.3" `inc_subrelease ""`
 
 TESTREL=alt2.M80P.3
-check inc_release "alt3.M80P" `inc_release ""`
-check inc_subrelease "alt2.M80P.4" `inc_subrelease ""`
+check inc_release "alt2.M80P.4" `inc_release ""`
+check inc_subrelease "alt2.M80P.3.1" `inc_subrelease ""`
 
 TESTREL=alt3.git20110916
 check inc_release "alt4.git20110916" `inc_release ""`
+
+TESTREL=alt3.S1
+check inc_release "alt4.S1" `inc_release ""`
+
+# FIXME: strange behaviour
+TESTREL=alt7.M70C.14
+check inc_release "alt7.M70C.15" `inc_release ""`
+check inc_subrelease "alt7.M70C.14.1" `inc_subrelease ""`
+
+TESTREL=alt7.M70C.14 is_backported_release $TESTREL && echo "backported: $TESTREL" || echo "FAILED: $TESTREL"
+TESTREL=alt7 is_backported_release $TESTREL && echo "not packported: $TESTREL" || echo "FAILED: $TESTREL"
+#TESTREL=alt7.SS.14 is_backported_release $TESTREL && echo "backported: $TESTREL" || echo "FAILED: $TESTREL"