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: 02-Mar-2007 11:06:03
Branch: HEAD Handle: 2007030210060300
Modified files:
openpkg-registry register.sh
Log:
upgrade safety (compensate incorrect values in conf and util files
that may occur on weird upgrade pathes)
Summary:
Revision Changes Path
1.62 +16 -0 openpkg-registry/register.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-registry/register.sh
============================================================================
$ cvs diff -u -r1.61 -r1.62 register.sh
--- openpkg-registry/register.sh 20 Feb 2007 22:19:24 -0000 1.61
+++ openpkg-registry/register.sh 2 Mar 2007 10:06:03 -0000 1.62
@@ -72,6 +72,14 @@
{
[ ".$REGISTRY_CONF" = . ] && return
if [ -r "$REGISTRY_CONF" ]; then
+
+ # upgrade safety for changed variable name
+ # please remove this code after 2007-06 snapshot
+ "$PREFIX/lib/openpkg/shtool" subst \
+ -e 's;^\( *REGISTRY_UUID *= *"[^/].*\)$;#\1;' \
+ "$REGISTRY_CONF" \
+ >/dev/null 2>&1 || true
+
sanitycheck "$REGISTRY_CONF" && . "$REGISTRY_CONF"
fi
}
@@ -80,6 +88,14 @@
{
[ ".$REGISTRY_UUID" = . ] && return
if [ -r "$REGISTRY_UUID" ]; then
+
+ # upgrade safety for changed variable name
+ # please remove this code after 2007-06 snapshot
+ "$PREFIX/lib/openpkg/shtool" subst \
+ -e 's;^ *REGISTRY_UUID *=;REGISTRY_DBID=;' \
+ "$REGISTRY_UUID" \
+ >/dev/null 2>&1 || true
+
sanitycheck "$REGISTRY_UUID" && . "$REGISTRY_UUID"
fi
}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
