OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Jul-2003 11:08:32
Branch: HEAD Handle: 2003071010083100
Modified files:
openpkg-src/openpkg rc
Log:
use more explanation in WARNING message on unresolved configuration
file conflict
Summary:
Revision Changes Path
1.28 +1 -0 openpkg-src/openpkg/rc
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.27 -r1.28 rc
--- openpkg-src/openpkg/rc 10 Jul 2003 07:19:37 -0000 1.27
+++ openpkg-src/openpkg/rc 10 Jul 2003 09:08:31 -0000 1.28
@@ -238,6 +238,7 @@
if [ -d @l_prefix@/etc/$s_name ]; then
if [ ".`find @l_prefix@/etc/$s_name -print 2>/dev/null | egrep
'.*\.rpm(new|orig|save)$'`" != . ]; then
echo "openpkg:rc:WARNING: package \"$s_name\" has unresolved
configuration file conflicts" 1>&2
+ echo "openpkg:rc:WARNING: indicated by \"*.rpm(new|orig|save)\"
files in \"@l_prefix@/etc/$s_name\"" 1>&2
fi
fi
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
