Changeset 552 for CMT/HEAD

Timestamp:

Aug 24, 2010, 12:37:01 PM (14 years ago)

Author:

rybkin

Message:

See C.L. 437

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_project.cxx (modified) (6 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2010-08-24    <rybkin@lal.in2p3.fr> 437
+
+        * source/cmt_project.cxx: In class Project function order_all, consider for
+        ordering projects (which may come from CMTPATH entries) other than current
+        in case current project does not have parents (may have children), unmark
+        tag with project name as appropriate, in function add, print error message
+        about conflicting releases without mode Verbose, in function create, fix
+        typo in diagnostic message. In class ProjectFactory function create_project,
+        add more info to debug message
+        
 2010-08-23    <rybkin@lal.in2p3.fr> 436
 

CMT/HEAD/source/cmt_project.cxx

@@ -200 +200 @@
   if (Cmt::get_debug ())
     {
-      cout << "Creating project " << path << " with parent " << ((parent==0)? "0" : parent->get_name ()) << endl;
+      cout << "Creating project " << specified_name << " in " << path << " from " << source << " with parent " << ((parent==0)? "0" : parent->get_name ()) << endl;
       Project::show_all ();
     }
@@ -704 +704 @@
   if (path != "")
     {
-      cout << " in " << path;
+      cerr << " in " << path;
     }
 
@@ -898 +898 @@
             if (release != project->get_release ())
               {
-                if (CmtMessage::active (Verbose))
-                  CmtMessage::error ("Project " + name
-                                     + " requested with conflicting releases "
-                                     + project->get_release () + " and " + release);
+                //if (CmtMessage::active (Verbose))
+                CmtMessage::error ("Project " + name
+                                   + " requested with conflicting releases "
+                                   + project->get_release () + " and " + release);
                 //              cerr << "#CMT> Project " << name << " requested with conflicting releases " << project->get_release () << " and " << release << endl;
                 CmtError::set (CmtError::project_release_conflict, name);
@@ -1032 +1032 @@
         {
           //
-          // Unset the tag with its name - TODO
+          // Unset the tag with its name
           //
+          Tag* tag = Tag::find (p.get_name ());
+          if (tag != 0)
+            tag->unmark ();
+
           p.set_is_current (false);
         }
@@ -1106 +1110 @@
 
   if (p == 0 ||
+      !p->has_parents ())
+    // may come from CMTPATH entry
+      /*
       (!p->has_parents () && p->get_children_size () == 0)
       // comes from CMTPATH entry
       )
+      */
     {
       for (int i = offset; i < size; i++)
@@ -1114 +1122 @@
           Project* q = &(Projects[i]);
           if (q != p && !q->has_parents ())
-            {
+            { // may come from CMTPATH entry
               q->m_order = ++order;
               projs.push_back (q);