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 openpkg-web Date: 28-Jul-2003 17:06:16
Branch: HEAD Handle: 2003072816061402
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rc
openpkg-web news.txt
Log:
stop processing 'start' and 'restart' scripts if .rpmsave files
exists, because this is too risky
Summary:
Revision Changes Path
1.21 +1 -0 openpkg-src/openpkg/HISTORY
1.183 +1 -1 openpkg-src/openpkg/openpkg.spec
1.44 +10 -3 openpkg-src/openpkg/rc
1.5873 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.20 -r1.21 HISTORY
--- openpkg-src/openpkg/HISTORY 27 Jul 2003 11:13:41 -0000 1.20
+++ openpkg-src/openpkg/HISTORY 28 Jul 2003 15:06:15 -0000 1.21
@@ -2,6 +2,7 @@
2003
====
+20030728 rc: stop processing 'start' and 'restart' scripts if .rpmsave files exists
20030727 rc: do not export TMPDIR at all, it causes problems for applications once
the directory is gone
20030721 rc: do not use TMPDIR -- instead use hard-coded /tmp
20030719 openpkg.boot: try to make build environment more sane by setting umask and
unsetting some strange aliases
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.182 -r1.183 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 27 Jul 2003 11:13:41 -0000 1.182
+++ openpkg-src/openpkg/openpkg.spec 28 Jul 2003 15:06:16 -0000 1.183
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030727
+%define V_openpkg 20030728
# the used software versions
%define V_rpm 4.0.2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.43 -r1.44 rc
--- openpkg-src/openpkg/rc 27 Jul 2003 11:13:41 -0000 1.43
+++ openpkg-src/openpkg/rc 28 Jul 2003 15:06:16 -0000 1.44
@@ -31,7 +31,7 @@
# program name, version and date
progname="rc"
progvers="1.2.0"
-progdate="16-Jul-2003"
+progdate="28-Jul-2003"
# path to OpenPKG instance
prefix="@l_prefix@"
@@ -287,8 +287,15 @@
# 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 -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 \"$prefix/etc/$s_name\"" 1>&2
+ case "$cmd" in
+ start|restart ) type="ERROR" ;;
+ * ) type="WARNING" ;;
+ esac
+ echo "openpkg:rc:${type}: package \"$s_name\" has unresolved
configuration file conflicts" 1>&2
+ echo "openpkg:rc:${type}: indicated by \"*.rpm(new|orig|save)\"
files in \"$prefix/etc/$s_name\"" 1>&2
+ if [ ".$type" = .ERROR ]; then
+ continue
+ fi
fi
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5872 -r1.5873 news.txt
--- openpkg-web/news.txt 28 Jul 2003 14:21:13 -0000 1.5872
+++ openpkg-web/news.txt 28 Jul 2003 15:06:14 -0000 1.5873
@@ -1,3 +1,4 @@
+28-Jul-2003: Upgraded package: P<openpkg-20030728-20030728>
28-Jul-2003: Upgraded package: P<samhain-1.7.10-1.20030728>
28-Jul-2003: Upgraded package: P<nntpcache-3.0.1-1.20030728>
28-Jul-2003: Upgraded package: P<x11-1.20030728-1.20030728>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
