Merge branch 'maint' into next

2008-03-20 15:31:03 -04:00 · 2008-03-20 15:31:03 -04:00 · abe85c9f1b
parent 2d328bb76d a7ee4e0183
commit abe85c9f1b
4 changed files with 309 additions and 304 deletions
--- a/debugfs/util.c
+++ b/debugfs/util.c
@ -82,6 +82,8 @@ FILE *open_pager(void)
 	char buf[80];

 	signal(SIGPIPE, SIG_IGN);
+	if (!isatty(1))
+		return stdout;
 	if (!pager)
 		pager = getenv("PAGER");
 	if (!pager)
--- a/po/de.gmo
+++ b/po/de.gmo
--- a/po/de.po
+++ b/po/de.po
--- a/tests/test_script.in
+++ b/tests/test_script.in
@ -8,7 +8,7 @@ export LC_ALL

 case "$1" in 
    --valgrind)
-    	export USE_VALGRIND="valgrind -q --weird-hacks=lax-ioctls"
+    	export USE_VALGRIND="valgrind -q --sim-hints=lax-ioctls"
 	shift;
 esac