OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Mar-2007 22:52:59
Branch: HEAD Handle: 2007032221525800
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec
Log:
cosmetic: align code variable name with documentation
Summary:
Revision Changes Path
1.442 +1 -0 openpkg-src/openpkg/HISTORY
1.577 +14 -14 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.441 -r1.442 HISTORY
--- openpkg-src/openpkg/HISTORY 21 Mar 2007 10:09:16 -0000 1.441
+++ openpkg-src/openpkg/HISTORY 22 Mar 2007 21:52:58 -0000 1.442
@@ -2,6 +2,7 @@
2007
====
+20070322 cosmetic: align code variable name with documentation
20070321 upgrade to openpkg-registry 1.1.2 replace HOSTNAME with FQDN when
creating OPENPKG_DESC default
20070320 automatic (re-)registration if previous registration, community
series or release set to openpkg URLs
20070320 improve generation of UUID_PLATFORM by using a better (no longer IP
based) "discriminator" value
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.576 -r1.577 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 21 Mar 2007 10:09:17 -0000 1.576
+++ openpkg-src/openpkg/openpkg.spec 22 Mar 2007 21:52:58 -0000 1.577
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20070321
+%define V_openpkg 20070322
# the used software versions
%define V_rpm 4.2.1
@@ -1627,12 +1627,12 @@
[ ".$prefix" = . ] && prefix="%{l_prefix}"
prefix=`echo "$prefix" | sed -e 's;//*;/;g' -e 's;/$;;'`
- # register the OpenPKG instance in /etc/openpkg
- registry="/etc/openpkg"
- exists=`cat $registry 2>/dev/null | egrep "^ *${prefix} *\$"`
+ # register instance in presence file
+ presence="/etc/openpkg"
+ exists=`cat $presence 2>/dev/null | egrep "^ *${prefix} *\$"`
if [ ".$exists" = . ]; then
( umask 022
- echo "${prefix}" >>$registry
+ echo "${prefix}" >>$presence
) 2>/dev/null || true
fi
@@ -2487,19 +2487,19 @@
r=`(uname -r) 2>/dev/null` || r='0.0'
plid="${s}/${r}"
- # unregister the OpenPKG instance in /etc/openpkg
- registry="/etc/openpkg"
- exists=`cat $registry 2>/dev/null | egrep "^ *${prefix} *\$"`
+ # unregister instance in presence file
+ presence="/etc/openpkg"
+ exists=`cat $presence 2>/dev/null | egrep "^ *${prefix} *\$"`
if [ ".$exists" != . ]; then
if [ ".$cusr" != ".root" ]; then
- echo "openpkg:WARNING: skipping unregistering of $prefix in
$registry" 1>&2
+ echo "openpkg:WARNING: skipping unregistering of $prefix in
$presence" 1>&2
echo "openpkg:WARNING: (would require root-privileges)" 1>&2
else
- cp $registry $registry.bak && \
- egrep -v "^ *${prefix} *\$" $registry.bak >$registry
- rm -f $registry.bak >/dev/null 2>&1
- if [ ".`cat $registry`" = . ]; then
- rm -f $registry >/dev/null 2>&1
+ cp $presence $presence.bak && \
+ egrep -v "^ *${prefix} *\$" $presence.bak >$presence
+ rm -f $presence.bak >/dev/null 2>&1
+ if [ ".`cat $presence`" = . ]; then
+ rm -f $presence >/dev/null 2>&1
fi
fi
fi
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
