Save function showed warning message in case of "save environment".

Change-Id: I3399fb195eb76bfb67444d6f02c0654d9ffe4742

diff --git a/scilab/CHANGES_5.4.X b/scilab/CHANGES_5.4.X
index e055648..32db32c 100644 (file)
--- a/scilab/CHANGES_5.4.X
+++ b/scilab/CHANGES_5.4.X
@@ -31,6 +31,8 @@ Bug Fixes
 * Bug #11411 fixed - save function used unsigned char to store length of string.
                      Now it is an integer.
 
+* Bug #11426 fixed - Save function shew a warning message saving user environment.
+
 * Bug #11509 fixed - A progression bar was missing during Atoms operations.
 
 * Bug #11592 fixed - In the documentation, example of bessel failed.

diff --git a/scilab/modules/io/sci_gateway/c/sci_save.c b/scilab/modules/io/sci_gateway/c/sci_save.c
index 5da354f..4d6a56c 100644 (file)
--- a/scilab/modules/io/sci_gateway/c/sci_save.c
+++ b/scilab/modules/io/sci_gateway/c/sci_save.c
@@ -138,10 +138,10 @@ int sci_save(char *fname, unsigned long fname_len)
     }
 
 
-    //new -> %_export_to_hdf5
-    //old
-    if (iOldSave)
-    {
+    //old save
+
+    if (iOldSave && Rhs > 1)
+    {//show warning only for variable save, not for environment.
         if (getWarningMode())
         {
             sciprint(_("%s: Scilab 6 will not support the file format used.\n"), _("Warning"));

diff --git a/scilab/modules/io/tests/nonreg_tests/bug_11426.dia.ref b/scilab/modules/io/tests/nonreg_tests/bug_11426.dia.ref
new file mode 100644 (file)
index 0000000..f8aa4e4
--- /dev/null
+++ b/scilab/modules/io/tests/nonreg_tests/bug_11426.dia.ref
@@ -0,0 +1,22 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2012 - Scilab Enterprises - Antoine ELIAS
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- ENGLISH IMPOSED -->
+//
+// <-- Non-regression test for bug 11426 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=11426
+//
+// <-- Short Description -->
+// Save function showed warning message in case of "save environment".
+oldMode = warning("query');
+warning("on");
+save(SCI + "/saveenv.dat");
+warning(oldMode);

diff --git a/scilab/modules/io/tests/nonreg_tests/bug_11426.tst b/scilab/modules/io/tests/nonreg_tests/bug_11426.tst
new file mode 100644 (file)
index 0000000..e4edcda
--- /dev/null
+++ b/scilab/modules/io/tests/nonreg_tests/bug_11426.tst
@@ -0,0 +1,23 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2012 - Scilab Enterprises - Antoine ELIAS
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- ENGLISH IMPOSED -->
+//
+// <-- Non-regression test for bug 11426 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=11426
+//
+// <-- Short Description -->
+// Save function showed warning message in case of "save environment".
+
+oldMode = warning("query');
+warning("on");
+save(SCI + "/saveenv.dat");
+warning(oldMode);
\ No newline at end of file