Changeset 666 for CMT/v1r25-branch/source

Timestamp:

Jan 26, 2014, 8:58:41 AM (10 years ago)

Author:

rybkin

Message:

merge -r 664:665 HEAD

Location:

CMT/v1r25-branch

Files:

• . (modified) (1 prop)
• source/cmt_error.cxx (modified) (1 diff)
• source/cmt_project.cxx (modified) (1 prop)
• source/cmt_symbol.cxx (modified) (5 diffs)

CMT/v1r25-branch/source/cmt_error.cxx

@@ -174 +174 @@
   cerr << "CMT> Error: " << get_error_name (e.get_code ()) << " : " << e.get_text () << endl;
   */
-  CmtMessage::error (get_last_error ());
+  if (CmtError::get_last_error_code () != CmtError::warning)
+    CmtMessage::error (get_last_error ());
+  else
+    CmtMessage::warning (get_last_error ());
 }
 

CMT/v1r25-branch/source/cmt_symbol.cxx

@@ -2369 +2369 @@
                 resolve_value (new_value, symbol.name, temp);
                 temp = new_value;
+
+                // We clear the error since the set is defined in requirements
+                // and the environment variable ought not to have been used
+                if (CmtError::get_last_error_code () == CmtError::warning &&
+                    CmtError::get_last_error () ==
+                    CmtError::get_error_name (CmtError::warning) + ": " "getenv (" + symbol.name + ") denied")
+                  CmtError::clear ();
               }
             else if (temp == "")
@@ -2391 +2398 @@
                     CmtError::set (CmtError::warning,
                                    "getenv (" + symbol.name + ") denied");
-                    return "";
+                    //              return "";
+                    // We will clear the error if the set is defined in requirements
                   }
               }
@@ -2680 +2688 @@
                     CmtError::set (CmtError::warning,
                                    "getenv (" + symbol.name + ") denied");
-                    return "";
+                    //              return "";
+                    // We will clear the error if the path is defined in requirements
                   }
 
@@ -2722 +2731 @@
                 //temp = new_value;
                 filter_path_value (symbol, temp_vector);
+
+                // We clear the error since the path is defined in requirements
+                // and the environment variable ought not to have been used
+                if (CmtError::get_last_error_code () == CmtError::warning &&
+                    CmtError::get_last_error () ==
+                    CmtError::get_error_name (CmtError::warning) + ": " "getenv (" + symbol.name + ") denied")
+                  CmtError::clear ();
               }
 
@@ -3819 +3835 @@
                   {
                     // print error occurred before value expansion
-                    CmtMessage::error (msg);
+                    if (code != CmtError::warning)
+                      CmtMessage::error (msg);
+                    else
+                      CmtMessage::warning (msg);
                   }
                 // We keep CmtError::warning to indicate that