- Timestamp:
- Mar 31, 2010, 6:36:09 PM (14 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r539 r540 1 2010-03-31 <rybkin@lal.in2p3.fr> 427 2 3 * source/cmt_vcs.cxx: In method GlobalProjectAction::run, add container 4 with relative path (rather than absolute) which can be used for container 5 checkout. Same in method Packages::find, when adding package in case of 6 found package validation failure. In method Walkthru::filter, print warning 7 and return in case of macro reference(s) encountered when reading 8 requirements 9 * source/cmt_project.cxx: In function Project::order_all, fix setting of 10 current project pointer 11 1 12 2010-03-30 <rybkin@lal.in2p3.fr> 426 2 13 -
CMT/HEAD/source/cmt_project.cxx
r537 r540 1010 1010 if (current_path_real.find (p.get_cmtpath_real ()) == 0) 1011 1011 { 1012 p_cur = &p; 1012 1013 if (p.is_current ()) continue; 1014 1013 1015 p.set_is_current (true); 1014 1016 // … … 1020 1022 tag = Tag::add (p.get_name (), PriorityConfig, "PROJECT", 0); 1021 1023 tag->mark (); 1022 1023 p_cur = &p;1024 1024 } 1025 1025 else if (p.is_current ()) -
CMT/HEAD/source/cmt_vcs.cxx
r539 r540 158 158 CmtMessage::verbose ("container " + use->get_info () + 159 159 " (" + use->real_path + ")"); 160 Use* cuse = Use::add (use->real_path, 160 // Use* cuse = Use::add (use->real_path, 161 Use* cuse = Use::add (use->path, 161 162 use->get_package_name (), 162 163 use->version, … … 352 353 return p_use; 353 354 } 354 Use* n_use = Use::add (use->real_path, 355 // Use* n_use = Use::add (use->real_path, 356 Use* n_use = Use::add (use->path, 355 357 use->get_package_name (), 356 358 use->version, … … 622 624 // cerr << " `" + s + "'"; 623 625 if (s[0] == '-') continue; 626 627 if (s.find ("$(") != cmt_string::npos 628 || s.find ("${") != cmt_string::npos) 629 { 630 CmtMessage::warning (line + 631 ": Skipped due to macro reference(s)." 632 " Consider using -C option."); 633 return; 634 } 624 635 625 636 switch (state) … … 4176 4187 CmtMessage::warning (use->get_info () + 4177 4188 ": Skipped due to wildcards in version." 4178 " Consider using -C o ption.");4189 " Consider using -C or -r HEAD option."); 4179 4190 return; 4180 4191 } … … 4242 4253 CmtMessage::warning (use->get_info () + 4243 4254 ": Skipped due to wildcards in version." 4244 " Consider using -C o ption.");4255 " Consider using -C or -r HEAD option."); 4245 4256 return; 4246 4257 }
Note: See TracChangeset
for help on using the changeset viewer.