Author: glen                         Date: Thu May 22 10:07:11 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- killing poldek discards rpm output, so output anything before poldek is 
killed; rel 69

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.45 -> 1.837.2.42.2.46) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.45 SPECS/rpm.spec:1.837.2.42.2.46
--- SPECS/rpm.spec:1.837.2.42.2.45      Sun May  4 11:30:11 2008
+++ SPECS/rpm.spec      Thu May 22 12:07:04 2008
@@ -36,7 +36,7 @@
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.4.9
-Release:       68
+Release:       69
 License:       LGPL
 Group:         Base
 Source0:       http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -1074,6 +1074,7 @@
        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
+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
@@ -1088,7 +1089,6 @@
        echo >&2 "Killing poldek ($p), don't panic :)"
        kill $p
 fi
-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"
@@ -1097,11 +1097,11 @@
        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
+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
-echo >&2 "You should rebuild your rpmdb: rpm --rebuilddb to avoid random rpmdb 
errors"
 
 %triggerpostun -- %{name} < 4.4.9-44
 %{_rpmlibdir}/hrmib-cache
@@ -1342,6 +1342,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.46  2008-05-22 10:07:04  glen
+- killing poldek discards rpm output, so output anything before poldek is 
killed; rel 69
+
 Revision 1.837.2.42.2.45  2008-05-04 09:30:11  glen
 - no lua for %tmpdir; rel 68
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to