From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 1 Feb 2004 02:24:51 +0000 (-0500)
Subject: problem.c (fix_problem): Don't call print_e2fsck_message if the
X-Git-Tag: E2FSPROGS-1_35-WIP-0131~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=489f00248f19fdb61d5c71ca57c4c26b1e451597;p=thirdparty%2Fe2fsprogs.git

problem.c (fix_problem): Don't call print_e2fsck_message if the
	message is empty; otherwise, the NLS substitution will
	print the .po header, which is Just Wrong.
---

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 6adb24c12..daf9e8b32 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-31  Theodore Ts'o  <tytso@mit.edu>
+
+	* problem.c (fix_problem): Don't call print_e2fsck_message if the
+		message is empty; otherwise, the NLS substitution will
+		print the .po header, which is Just Wrong.
+
 2004-01-30  Theodore Ts'o  <tytso@mit.edu>
 
 	* pass2.c (deallocate_inode_block): Check to make sure the block
diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 9f0b561dd..f2673724c 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -1558,7 +1558,8 @@ int fix_problem(e2fsck_t ctx, problem_t code, struct problem_context *pctx)
 			printf("%s: ", ctx->device_name ?
 			       ctx->device_name : ctx->filesystem_name);
 		}
-		print_e2fsck_message(ctx, _(message), pctx, 1);
+		if (*message)
+			print_e2fsck_message(ctx, _(message), pctx, 1);
 	}
 	if (!(ptr->flags & PR_PREEN_OK) && (ptr->prompt != PROMPT_NONE))
 		preenhalt(ctx);