rpms/libguestfs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add fix for regressions/rhbz557655.sh so it works when tracing is enabled.

Browse Source
This commit is contained in:
Richard W.M. Jones 2011-02-02 20:28:11 +00:00
parent 35b079cbb4
commit 02f4972a3e
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-appliance-Force-etc-mtab-to-be-a-symlink-to-proc-mou.patch
View File

@ -1,7 +1,7 @@
From 522da71ebdbca3b69978292a818b9317905a7d3c Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 2 Feb 2011 18:33:25 +0000
Subject: [PATCH] appliance: Force /etc/mtab to be a symlink to /proc/mounts
Subject: [PATCH 1/2] appliance: Force /etc/mtab to be a symlink to /proc/mounts
Since Fedora util-linux 2.19, the %post script has done:

24
0002-regressions-Fix-rhbz557655.sh-so-it-works-with-traci.patch Normal file
View File

@ -0,0 +1,24 @@
From 1668c3fcc9a67e59c98121a473d68087d105d334 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 2 Feb 2011 20:26:19 +0000
Subject: [PATCH 2/2] regressions: Fix rhbz557655.sh so it works with tracing enabled.
---
regressions/rhbz557655.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/regressions/rhbz557655.sh b/regressions/rhbz557655.sh
index 2306147..2bc10cd 100755
--- a/regressions/rhbz557655.sh
+++ b/regressions/rhbz557655.sh
@@ -77,6 +77,7 @@ EOF
# number of truncate_size.
mv test.err test.err~
grep -E 'set[-_]memsize|truncate[-_]size' test.err~ |
+ grep -Ev 'libguestfs: trace:' |
grep -Ev 'proc 200' > test.err
rm test.err~
--
1.7.3.5

9
libguestfs.spec
View File

@ -30,7 +30,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.9.7
Release: 4%{?dist}
Release: 5%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@ -44,6 +44,9 @@ Patch0: libguestfs-1.7.13-no-fuse-test.patch
# See: https://www.redhat.com/archives/libguestfs/2011-February/msg00006.html
Patch1: 0001-appliance-Force-etc-mtab-to-be-a-symlink-to-proc-mou.patch
# Fix for regressions/rhbz557655.sh so it works when tracing is enabled.
Patch2: 0002-regressions-Fix-rhbz557655.sh-so-it-works-with-traci.patch
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2text
@ -431,6 +434,7 @@ php-%{name} contains PHP bindings for %{name}.
%patch0 -p1
%patch1 -p1
%patch2 -p1
mkdir -p daemon/m4
@ -762,9 +766,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Feb 2 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.7-4
* Wed Feb 2 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.7-5
- Add temporary non-upstream patch to fix /etc/mtab.
See: https://www.redhat.com/archives/libguestfs/2011-February/msg00006.html
- Add fix for regressions/rhbz557655.sh so it works when tracing is enabled.
* Tue Feb 1 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.7-3
- Enable trace in 'make check' section.