OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-tools Date: 11-Oct-2005 23:46:59
Branch: HEAD Handle: 2005101122465900
Modified files:
openpkg-tools/cmd dev.sh
Log:
detected and handle post-branch pre-release engineering phase
Summary:
Revision Changes Path
1.64 +14 -4 openpkg-tools/cmd/dev.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
============================================================================
$ cvs diff -u -r1.63 -r1.64 dev.sh
--- openpkg-tools/cmd/dev.sh 11 Oct 2005 20:37:07 -0000 1.63
+++ openpkg-tools/cmd/dev.sh 11 Oct 2005 21:46:59 -0000 1.64
@@ -651,13 +651,23 @@
fi
if [ ".${BRANCH}" = .SOLID ]; then
update=`echo ${rpm_release_old} | sed -e 's;^.*\.;;'`
- if [ ".${update}" = . ]; then
- update=0
+ if [ ".${update}" = .0 ]; then
+ RELEASE=`echo "$B" | sed -e 's;_SOLID$;_RELEASE;'`
+ cvs_release=`builtin cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO}
log -r${cvs_rev} $S/${name}/${name}.spec 2>/dev/null | fgrep $RELEASE`
+ if [ ".${cvs_release}" = . ]; then
+ echo "++ detected post-branch pre-release engineering phase
- keep zero update number"
+ rpm_release_req="${OPMAJORV}.${OPMINORV}.0"
+ upload="release/${OPMAJORV}.${OPMINORV}/SRC/"
+ else
+ update=`expr ${update} + 1`
+ rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
+ upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD/"
+ fi
else
update=`expr ${update} + 1`
+ rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
+ upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD/"
fi
- rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
- upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD/"
fi
}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
