OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-registry Date: 29-Nov-2005 18:59:37
Branch: HEAD Handle: 2005112917593700
Modified files:
openpkg-registry register.sh
Log:
prevent rpm.sh/register.sh loop bypassing the openpkg wrapper
Summary:
Revision Changes Path
1.17 +7 -2 openpkg-registry/register.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-registry/register.sh
============================================================================
$ cvs diff -u -r1.16 -r1.17 register.sh
--- openpkg-registry/register.sh 29 Nov 2005 17:04:49 -0000 1.16
+++ openpkg-registry/register.sh 29 Nov 2005 17:59:37 -0000 1.17
@@ -38,6 +38,11 @@
PREFIX="${OPENPKG_PREFIX}"
fi
+# determine old binary-only vs. shell+binary situation
+oldbinnewsh="$PREFIX/libexec/openpkg/rpm" # old binary rpm, new embedded
shell rpm
+oldnanewbin="$PREFIX/lib/openpkg/rpm" # old n/a, new binary rpm
+if [ -x $oldbinnewsh -a -x $oldnanewbin ]; then exec $oldnanewbin "$@"; fi
+
# http post
curl="$PREFIX/lib/openpkg/curl"
useragent="openpkg-$progname/$progvers"
@@ -104,8 +109,8 @@
REGISTRY_DESC="openpkg://${HOSTNAME}${PREFIX}"
# Advanced options
-REGISTRY_PLAT="`$PREFIX/bin/openpkg rpm --eval '%{l_platform -p}'`"
-REGISTRY_OREL="`$PREFIX/bin/openpkg rpm --eval '%{l_openpkg_release}'`"
+REGISTRY_PLAT="`$oldbinnewsh --eval '%{l_platform -p}'`"
+REGISTRY_OREL="`$oldbinnewsh --eval '%{l_openpkg_release}'`"
REGISTRY_UUID="$PREFIX/etc/openpkg/uuid"
REGISTRY_CONF="$PREFIX/etc/openpkg/register.conf"
REGISTRY_PREP="$PREFIX/etc/openpkg/register.prep"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
