Changeset 649 for CMT

Timestamp:

Jul 10, 2013, 3:10:54 PM (11 years ago)

Author:

rybkin

Message:

See C.L. 508

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_commands.cxx (modified) (3 diffs)
• source/cmt_parser.cxx (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2013-07-10    <rybkin@lal.in2p3.fr> 508
+
+        * source/cmt_commands.cxx: In class ArgParser function option_use, make
+        -use=<package>:<version>:<path> option fully functional with standard use
+        statement syntax, in function option_path, make -path=<path> option
+        functional for relative <path> as with standard use statement syntax
+        * source/cmt_parser.cxx: In class Cmt functions reach_current_package,
+        use_extra_file make diagnostic message more informative
+
 2013-07-09    <rybkin@lal.in2p3.fr> 507
 

CMT/HEAD/source/cmt_commands.cxx

@@ -1952 +1952 @@
     {
       CmtSystem::cmt_string_vector words;
-
       CmtSystem::split (arg, ":", words);
 
       cmt.m_current_access = UserMode;
+
+      cmt.m_current_package = "";
+      cmt.m_current_version = "";
+      cmt.m_current_path = "";
 
       if (words.size () > 0) cmt.m_current_package = words[0];
@@ -1976 +1979 @@
           use.change_path (CmtSystem::pwd ());
         }
-      else if (!use.move_to ("", true))
+      else if (!use.move_to ())
         {
           CmtError::set (CmtError::package_not_found, use.get_info ());
@@ -2062 +2065 @@
           use.change_path (CmtSystem::pwd ());
         }
-      else if (!use.move_to ("", true))
+      else if (!use.move_to ())
         {
           CmtError::set (CmtError::package_not_found, use.get_info ());

CMT/HEAD/source/cmt_parser.cxx

@@ -7981 +7981 @@
         //      if (!use.move_to ())
         {
-          CmtError::set (CmtError::package_not_found,
-                         "ReachCurrentPackage> Cannot reach the path directory");
+          CmtError::set (CmtError::package_not_found, use.get_info ());
+//           CmtError::set (CmtError::package_not_found,
+//                          "ReachCurrentPackage> Cannot reach the path directory");
           return (0);
         }
@@ -8173 +8174 @@
         //      if (!use.move_to ())
         {
-          CmtError::set (CmtError::package_not_found,
-                         "ReachCurrentPackage> Cannot reach the path directory");
+          CmtError::set (CmtError::package_not_found, use.get_info ());
+//           CmtError::set (CmtError::package_not_found,
+//                          "ReachCurrentPackage> Cannot reach the path directory");
           //          return -1;
           return (0);