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: 22-Dec-2006 21:55:36
Branch: HEAD Handle: 2006122220553600
Modified files:
openpkg-tools/cmd dev.sh
Log:
workaround for specs that have multiple "openpkg >= " (build)prereqs
Summary:
Revision Changes Path
1.96 +5 -4 openpkg-tools/cmd/dev.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
============================================================================
$ cvs diff -u -r1.95 -r1.96 dev.sh
--- openpkg-tools/cmd/dev.sh 22 Dec 2006 19:48:40 -0000 1.95
+++ openpkg-tools/cmd/dev.sh 22 Dec 2006 20:55:36 -0000 1.96
@@ -935,17 +935,18 @@
(builtin cd ${OPENPKG_WORK}/$S/${name} && cvs update)
else
echo "++ joining package ${name} with HEAD"
+ #FIXME the sed -n -e '1p' aka head -1 lines only workaround
a problem with specs that have multiple "openpkg >= " (build)prereqs, e.g.
openpkg-tools
(cd ${OPENPKG_WORK}/$S/${name} || exit 1
anchestor=""; cvs log ${name}.spec | sed -n -e '/^symbolic
names:/,/^[^ \t]/p' | sed -e '1d' -e 's/^[ \t]*//' -e '$d' | ${EGREP}
"^${B}_MP: " >/dev/null && anchestor="${B}_MP"
tmpfile="${OPENPKG_TEMP}/${name}${GUID}"
haverelease=`${EGREP} <${name}.spec '^Release:'`
- havebprereq=`${EGREP} <${name}.spec '^BuildPreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
- haverprereq=`${EGREP} <${name}.spec '^PreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
+ havebprereq=`${EGREP} <${name}.spec '^BuildPreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;' | sed -n -e
'1p'`
+ haverprereq=`${EGREP} <${name}.spec '^PreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;' | sed -n -e
'1p'`
cvs up -p -r1 ${name}.spec >${tmpfile} 2>/dev/null
joinrelease=`${EGREP} <${tmpfile} '^Release: '`
joinversion=`${EGREP} <${tmpfile} '^Version: '`
- joinbprereq=`${EGREP} <${tmpfile} '^BuildPreReq: .*openpkg
*>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
- joinrprereq=`${EGREP} <${tmpfile} '^PreReq: .*openpkg
*>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
+ joinbprereq=`${EGREP} <${tmpfile} '^BuildPreReq: .*openpkg
*>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;' | sed -n -e '1p'`
+ joinrprereq=`${EGREP} <${tmpfile} '^PreReq: .*openpkg
*>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;' | sed -n -e '1p'`
sed <${name}.spec >${name}.spec.n \
-e "s;^Release: .*$;$joinrelease;" \
-e "s;^Version: .*$;$joinversion;" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
