SPECS (rpm-4_5): rpm.spec - don't need the poldek killing, i hope!; rel 5

[glen]

Author: glen                         Date: Thu Nov 13 09:55:13 2008 GMT
Module: SPECS                         Tag: rpm-4_5
---- Log message:
- don't need the poldek killing, i hope!; rel 5

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.49.2.41 -> 1.837.2.42.2.49.2.42) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.49.2.41 SPECS/rpm.spec:1.837.2.42.2.49.2.42
--- SPECS/rpm.spec:1.837.2.42.2.49.2.41	Sun Nov  9 17:29:44 2008
+++ SPECS/rpm.spec	Thu Nov 13 10:55:08 2008
@@ -52,7 +52,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.5
-Release:	4
+Release:	5
 License:	LGPL
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
@@ -1155,20 +1155,6 @@
 	rm -f /etc/vservers/*/apps/pkgmgmt/base/rpm/state/__*
 fi
 echo >&2 "You should rebuild your rpmdb: rpm --rebuilddb to avoid random rpmdb errors"
-# TODO: poldek should abort if it can't reopen rpmdb after rpm exec:
-#Installing set #3
-#rpmdb: Program version 4.2 doesn't match environment version
-#error: db4 error(22) from dbenv->open: Invalid argument
-#error: cannot open Packages index using db3 - Invalid argument (22)
-#error: //var/lib/rpm: open rpm database failed
-#Processing dependencies...
-#There are more than one package which provide "/bin/sh":
-# if poldek is running, kill it so it will not attempt to fill whole rpmdb
-p=$(/sbin/pidof poldek)
-if [ "$p" ]; then
-	echo >&2 "Killing poldek ($p), don't panic :)"
-	kill $p
-fi
 
 %triggerpostun lib -- db4.5 < %{reqdb_ver}
 echo >&2 "db4.5 upgrade: Removing /var/lib/rpm/__db* from older rpmdb version"
@@ -1178,10 +1164,6 @@
 	rm -f /etc/vservers/*/apps/pkgmgmt/base/rpm/state/__*
 fi
 echo >&2 "You should rebuild your rpmdb: rpm --rebuilddb to avoid random rpmdb errors"
-if [ "$p" ]; then
-	echo >&2 "Killing poldek ($p), don't panic :)"
-	kill $p
-fi
 
 %triggerpostun -- %{name} < 4.4.9-44
 %{_rpmlibdir}/hrmib-cache
@@ -1421,6 +1403,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.42  2008/11/13 09:55:08  glen
+- don't need the poldek killing, i hope!; rel 5
+
 Revision 1.837.2.42.2.49.2.41  2008/11/09 16:29:44  glen
 - fix popt exec searchpath to be /usr/lib/rpm not /usr/lib/rpm/4.5; rel 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.42.2.49.2.41&r2=1.837.2.42.2.49.2.42&f=u