OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-May-2006 15:12:57
Branch: HEAD Handle: 2006051714125600
Modified files:
openpkg-src/openpkg HISTORY uuid.sh
Log:
make "openpkg uuid update" processing more robust to prevent problems
Summary:
Revision Changes Path
1.333 +1 -0 openpkg-src/openpkg/HISTORY
1.8 +9 -6 openpkg-src/openpkg/uuid.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.332 -r1.333 HISTORY
--- openpkg-src/openpkg/HISTORY 17 May 2006 07:35:29 -0000 1.332
+++ openpkg-src/openpkg/HISTORY 17 May 2006 13:12:56 -0000 1.333
@@ -2,6 +2,7 @@
2006
====
+20060517 make "openpkg uuid update" processing more robust to prevent
problems
20060517 fix output of "openpkg build" wrapper script
20060515 fix building of OpenSSL by reducing used Perl features (integer.pm,
Cwd.pm)
20060514 fix building of OpenSSL by reducing used Perl features (find.pl,
strict.pm)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/uuid.sh
============================================================================
$ cvs diff -u -r1.7 -r1.8 uuid.sh
--- openpkg-src/openpkg/uuid.sh 1 Jan 2006 13:17:54 -0000 1.7
+++ openpkg-src/openpkg/uuid.sh 17 May 2006 13:12:56 -0000 1.8
@@ -173,11 +173,14 @@
echo "uuid: calculating OpenPKG Registry UUID (UUID_REGISTRY):"
echo "uuid: << $prog_uuid -v1 $opt"
fi
- UUID_REGISTRY=`$prog_uuid -v1 $opt`
- if [ ".$opt_v" = .yes ]; then
- echo "uuid: >> $UUID_REGISTRY (NOT REPEATABLE)"
+ uuid=`$prog_uuid -v1 $opt`
+ if [ ".$UUID_REGISTRY" != ".$uuid" -a ".$uuid" != . ]; then
+ UUID_REGISTRY="$uuid"
+ if [ ".$opt_v" = .yes ]; then
+ echo "uuid: >> $UUID_REGISTRY (NOT REPEATABLE)"
+ fi
+ changed=yes
fi
- changed=yes
fi
# update instance UUID
@@ -211,7 +214,7 @@
if [ ".$opt_v" = .yes ]; then
echo "uuid: >> $uuid"
fi
- if [ ".$UUID_INSTANCE" != ".$uuid" ]; then
+ if [ ".$UUID_INSTANCE" != ".$uuid" -a ".$uuid" != . ]; then
UUID_INSTANCE="$uuid"
changed=yes
fi
@@ -244,7 +247,7 @@
if [ ".$opt_v" = .yes ]; then
echo "uuid: >> $uuid"
fi
- if [ ".$UUID_PLATFORM" != ".$uuid" ]; then
+ if [ ".$UUID_PLATFORM" != ".$uuid" -a ".$uuid" != . ]; then
UUID_PLATFORM="$uuid"
changed=yes
fi
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
