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: 21-Jun-2006 14:58:05
Branch: HEAD Handle: 2006062113580401
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rc
Log:
complain also about .rpmsave/.rpmnew files if it is a symbolic link
(usually created manually)
Summary:
Revision Changes Path
1.338 +1 -0 openpkg-src/openpkg/HISTORY
1.491 +1 -1 openpkg-src/openpkg/openpkg.spec
1.63 +1 -1 openpkg-src/openpkg/rc
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.337 -r1.338 HISTORY
--- openpkg-src/openpkg/HISTORY 19 Jun 2006 09:54:00 -0000 1.337
+++ openpkg-src/openpkg/HISTORY 21 Jun 2006 12:58:04 -0000 1.338
@@ -2,6 +2,7 @@
2006
====
+20060621 complain also about .rpmsave/.rpmnew files if it is a symbolic link
(usually created manually)
20060619 downgrade to cURL 7.15.3 til a suitable solution for long
line-capable 'grep -e' is found
20060619 backout SMF and revert to classic System V init style on Solaris 10
due to complete brokenness
20060618 support bootstrap "Release:" tags for N-STABLE branches
("N.YYYMMDD")
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.490 -r1.491 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 19 Jun 2006 09:54:01 -0000 1.490
+++ openpkg-src/openpkg/openpkg.spec 21 Jun 2006 12:58:04 -0000 1.491
@@ -38,7 +38,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20060619
+%define V_openpkg 20060621
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.62 -r1.63 rc
--- openpkg-src/openpkg/rc 1 Jan 2006 13:17:51 -0000 1.62
+++ openpkg-src/openpkg/rc 21 Jun 2006 12:58:05 -0000 1.63
@@ -293,7 +293,7 @@
# check for upgraded package with unresolved configuration file
conflicts
if [ -d "$prefix/etc/$s_name" -a ".$eval" != .1 ]; then
- if [ ".`find $prefix/etc/$s_name -type f -print 2>/dev/null |
egrep -v '.*/\.(snap|snapshot)/.*' | egrep '.*\.rpm(new|orig|save)$'`" != . ];
then
+ if [ ".`(find $prefix/etc/$s_name -type f -print; find
$prefix/etc/$s_name -type l -print) 2>/dev/null | egrep -v
'.*/\.(snap|snapshot)/.*' | egrep '.*\.rpm(new|orig|save)$'`" != . ]; then
case "$cmd" in
start|restart ) type="ERROR" ;;
* ) type="WARNING" ;;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
