RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 28-Aug-2007 18:14:07
Branch: rpm-4_5 Handle: 2007082817140700
Modified files: (Branch: rpm-4_5)
rpm CHANGES
rpm/scripts rpm.daily
Log:
- rpm.org: avoid truncating /var/log/rpmpkgs in case of errors
(rhbz#232830)
Summary:
Revision Changes Path
1.1360.2.36 +1 -0 rpm/CHANGES
1.3.2.1 +7 -2 rpm/scripts/rpm.daily
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1360.2.35 -r1.1360.2.36 CHANGES
--- rpm/CHANGES 28 Aug 2007 16:10:18 -0000 1.1360.2.35
+++ rpm/CHANGES 28 Aug 2007 16:14:07 -0000 1.1360.2.36
@@ -1,4 +1,5 @@
4.4.9 -> 4.5:
+ - rpm.org: avoid truncating /var/log/rpmpkgs in case of errors (rhbz#232830)
- jbj: update debugedit to include buildid changes.
- jbj: update id.po (Translation Project).
- jbj: prepare for open as a macro in bleeding edge glibc-2.6.90+.
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/rpm.daily
============================================================================
$ cvs diff -u -r1.3 -r1.3.2.1 rpm.daily
--- rpm/scripts/rpm.daily 25 May 2007 17:36:39 -0000 1.3
+++ rpm/scripts/rpm.daily 28 Aug 2007 16:14:07 -0000 1.3.2.1
@@ -1,4 +1,9 @@
#!/bin/sh
-/usr/bin/rpmquery -qa --qf '%{name}-%{version}-%{release}.%{arch}.rpm\n' 2>&1 \
- | sort > /var/log/rpmpkgs
+tmpfile=`/bin/mktemp rpmpkgs.XXXXXXXXX` || exit 1
+/bin/rpm -qa --qf '%{name}-%{version}-%{release}.%{arch}.rpm\n' 2>&1 \
+ | /bin/sort > "$tmpfile"
+
+[ -s "$tmpfile" ] || exit 1
+/bin/mv "$tmpfile" /var/log/rpmpkgs
+/bin/chmod 0644 /var/log/rpmpkgs
@@ .
Received on Tue Aug 28 18:14:07 2007