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: 20-Mar-2007 23:12:43
Branch: HEAD Handle: 2007032022124300
Modified files:
openpkg-src/openpkg HISTORY rc.openpkg
Log:
automatic (re-)registration if previous registration, community series
or release set to openpkg URLs
Summary:
Revision Changes Path
1.440 +1 -0 openpkg-src/openpkg/HISTORY
1.23 +12 -6 openpkg-src/openpkg/rc.openpkg
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.439 -r1.440 HISTORY
--- openpkg-src/openpkg/HISTORY 20 Mar 2007 12:50:58 -0000 1.439
+++ openpkg-src/openpkg/HISTORY 20 Mar 2007 22:12:43 -0000 1.440
@@ -2,6 +2,7 @@
2007
====
+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
20070320 remove old support for never finished rcng
20070320 remove old backward compatibility from rc.func for OpenPKG 1.2's
opXXX functions
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc.openpkg
============================================================================
$ cvs diff -u -r1.22 -r1.23 rc.openpkg
--- openpkg-src/openpkg/rc.openpkg 21 Feb 2007 10:42:44 -0000 1.22
+++ openpkg-src/openpkg/rc.openpkg 20 Mar 2007 22:12:43 -0000 1.23
@@ -28,12 +28,18 @@
%hourly -u @l_musr@
rcService openpkg enable yes || exit 0
- reregister=0; @l_prefix@/bin/openpkg register --printstatus >/dev/null
2>&1 && reregister=1
- # check for "openpkg" executable from the OpenPKG Community series
- # if OSS, register with openpkg.org
- [EMAIL PROTECTED]@/bin/openpkg --license 2>/dev/null | \
- sed -e 'q' | egrep '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*-C'`
- if [ ".$community_version" != . -o $reregister -eq 1 ]; then
+ # automatic (re-)registration
+ reregister=0
+ # re-register if previously registered
+ @l_prefix@/bin/openpkg register --printstatus >/dev/null 2>&1 &&
reregister=1
+ # re-register if "openpkg" executable from community series
+ [ $reregister -eq 0 ] && @l_prefix@/bin/openpkg --license 2>/dev/null \
+ | sed -e 'q' | egrep '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*-C'
>/dev/null && reregister=1
+ # re-register if "openpkg release" configured to pull packages
directly from openpkg.(org|com|net)
+ [ $reregister -eq 0 ] && @l_prefix@/bin/openpkg release --fmt='%u' \
+ | egrep '^[^:]*://(([^:]*:)?([EMAIL
PROTECTED]@)?)?([^/]*\.)?openpkg\.(com|org|net)/' >/dev/null && reregister=1
+ # perform (re-)registration
+ if [ $reregister -eq 1 ]; then
[ $openpkg_reghour -lt 00 -o $openpkg_reghour -gt 23 ] &&
openpkg_reghour="3"
now=`date '+%H'`
[ $openpkg_reghour -eq $now ] || exit 0
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
