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: 20-Jun-2006 15:20:46
Branch: HEAD Handle: 2006062014204500
Modified files:
openpkg-tools/cmd dev.sh
Log:
allow M.N.YYYYMMDD release naming on SOLID branches, too
Summary:
Revision Changes Path
1.78 +10 -3 openpkg-tools/cmd/dev.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
============================================================================
$ cvs diff -u -r1.77 -r1.78 dev.sh
--- openpkg-tools/cmd/dev.sh 8 Jun 2006 19:11:48 -0000 1.77
+++ openpkg-tools/cmd/dev.sh 20 Jun 2006 13:20:45 -0000 1.78
@@ -737,9 +737,16 @@
upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD"
fi
else
- update=`expr ${update} + 1`
- rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
- upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD"
+ echo "${update}" | ${EGREP} "^[0-9]{8}$" >/dev/null
+ if [ $? != 0 ]; then
+ update=`expr ${update} + 1`
+ rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
+ upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD"
+ else
+ update=`date '+%Y%m%d'`
+ rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
+ upload="solid/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD"
+ fi
fi
fi
}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
