From 3389804bf1a2cc6bcea41e527ef1acf88b4aecd1 Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Fri, 25 Apr 2008 12:54:25 +0000
Subject: [PATCH] Fix bug 4791.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@24503 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/support/Package.cpp.in | 4 ++--
 status.15x                 | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/support/Package.cpp.in b/src/support/Package.cpp.in
index f02b5e5d30..7c1bdd6049 100644
--- a/src/support/Package.cpp.in
+++ b/src/support/Package.cpp.in
@@ -643,7 +643,7 @@ FileName const get_default_user_support_dir(FileName const & home_dir)
 
 
 // Check that directory @c dir contains @c file.
-// Else emit a warning about an invalid @c command_line_switch.
+// Else throw an error about an invalid @c command_line_switch.
 bool check_command_line_dir(string const & dir,
 			    string const & file,
 			    string const & command_line_switch)
@@ -651,7 +651,7 @@ bool check_command_line_dir(string const & dir,
 	FileName const abs_path = fileSearch(dir, file);
 	if (abs_path.empty()) {
 		// FIXME UNICODE
-		throw ExceptionMessage(WarningException, _("File not found"), bformat(
+		throw ExceptionMessage(ErrorException, _("File not found"), bformat(
 			_("Invalid %1$s switch.\nDirectory %2$s does not contain %3$s."),
 			from_utf8(command_line_switch), from_utf8(dir),
 			from_utf8(file)));
diff --git a/status.15x b/status.15x
index fbf27acfb7..5d7300b78b 100644
--- a/status.15x
+++ b/status.15x
@@ -133,6 +133,9 @@ What's new
 - Fix an assertion with compressed image files that do not have a
   zip-extension.
 
+- Fix an assertion with incorrect argument for '-sysdir' command-line switch
+  (bug 4791).
+
 - Correctly apply font changes when several math matrix cells are selected
   (bug 4566).