SPECS (AC-branch): rpm.spec - removing vservers rpmdb regionfiles ...

[glen]

Author: glen                         Date: Tue Mar 25 17:00:23 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- removing vservers rpmdb regionfiles trigger; rel 55

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.28 -> 1.837.2.42.2.29) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.28 SPECS/rpm.spec:1.837.2.42.2.29
--- SPECS/rpm.spec:1.837.2.42.2.28	Mon Mar 24 21:10:48 2008
+++ SPECS/rpm.spec	Tue Mar 25 18:00:17 2008
@@ -36,7 +36,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	54
+Release:	55
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -1059,7 +1059,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %triggerpostun lib -- %{name}-lib < %{version}
-echo >&2 "rpm-lib upgrade: removing /var/lib/rpm/__db* from older rpmdb version"
+echo >&2 "rpm-lib upgrade: Removing /var/lib/rpm/__db* from older rpmdb version"
+rm -f /var/lib/rpm/__db*
+if [ -d /vservers ]; then
+	echo >&2 "rpm-lib upgrade: Removing vservers apps/pkgmgmt/base/rpm/state/__* from older rpmdb version"
+	rm -f /etc/vservers/*/apps/pkgmgmt/base/rpm/state/__*
+fi
 # 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
@@ -1074,17 +1079,19 @@
 	echo >&2 "Killing poldek ($p), don't panic :)"
 	kill $p
 fi
-rm -f /var/lib/rpm/__db*
 echo >&2 "You should rebuild your rpmdb: rpm --rebuilddb to avoid random rpmdb errors"
 
 %triggerpostun lib -- db4.5 < %{reqdb_ver}
-echo >&2 "db4.5 upgrade: removing /var/lib/rpm/__db* from older rpmdb version"
-p=$(/sbin/pidof poldek)
+echo >&2 "db4.5 upgrade: Removing /var/lib/rpm/__db* from older rpmdb version"
+rm -f /var/lib/rpm/__db*
+if [ -d /vservers ]; then
+	echo >&2 "db4.5 upgrade: Removing vservers apps/pkgmgmt/base/rpm/state/__* from older rpmdb version"
+	rm -f /etc/vservers/*/apps/pkgmgmt/base/rpm/state/__*
+fi
 if [ "$p" ]; then
 	echo >&2 "Killing poldek ($p), don't panic :)"
 	kill $p
 fi
-rm -f /var/lib/rpm/__db*
 echo >&2 "You should rebuild your rpmdb: rpm --rebuilddb to avoid random rpmdb errors"
 
 %pretrans
@@ -1334,6 +1341,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.29  2008-03-25 17:00:17  glen
+- removing vservers rpmdb regionfiles trigger; rel 55
+
 Revision 1.837.2.42.2.28  2008-03-24 20:10:48  glen
 - noautoreqdep libdns_sd.so.1; rel 54
 
================================================================

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