SPECS (AC-branch): rpm.spec - just in case remove __db* after pold...

glen glen at pld-linux.org
Thu Mar 6 13:11:21 CET 2008


Author: glen                         Date: Thu Mar  6 12:11:21 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- just in case remove __db* after poldek has been terminated

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.21 -> 1.837.2.42.2.22) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.21 SPECS/rpm.spec:1.837.2.42.2.22
--- SPECS/rpm.spec:1.837.2.42.2.21	Wed Mar  5 08:36:44 2008
+++ SPECS/rpm.spec	Thu Mar  6 13:11:15 2008
@@ -36,7 +36,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	47
+Release:	48
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -1054,8 +1054,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %triggerpostun lib -- %{name}-lib < %{version}
-echo >&2 "Removing /var/lib/rpm/__db* from older rpmdb version"
-rm -f /var/lib/rpm/__db*
+echo >&2 "rpm-lib upgrade: removing /var/lib/rpm/__db* from older rpmdb version"
 # 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
@@ -1070,16 +1069,17 @@
 	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 "Removing /var/lib/rpm/__db* from older rpmdb version"
-rm -f /var/lib/rpm/__db*
+echo >&2 "db4.5 upgrade: removing /var/lib/rpm/__db* from older rpmdb version"
 p=$(/sbin/pidof poldek)
 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
@@ -1320,6 +1320,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.22  2008-03-06 12:11:15  glen
+- just in case remove __db* after poldek has been terminated
+
 Revision 1.837.2.42.2.21  2008-03-05 07:36:44  glen
 - rel 47 (for util-vserver %{_tmpdir} macro w/o subshell)
 
================================================================

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



More information about the pld-cvs-commit mailing list