- Timestamp:
- Jan 27, 2012, 4:47:18 PM (12 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r600 r603 1 2012-01-27 <rybkin@lal.in2p3.fr> 478 2 3 * source/cmt_parser.cxx: In class Cmt function print_clean, use unset on 4 set variables only to work around Z Shell unset builtin command being POSIX 5 non-conformant (exit code of 1 on unset variables) 6 * source/cmt_symbol.cxx: In class Symbol functions print_clean, print, idem 7 1 8 2012-01-06 <rybkin@lal.in2p3.fr> 477 2 9 -
CMT/HEAD/source/cmt_parser.cxx
r599 r603 7502 7502 if (Me.m_current_package != "CMT") 7503 7503 { 7504 cout << "unset " << prefix << "ROOT" << endl; 7505 cout << "unset " << prefix << "CONFIG" << endl; 7504 cout << "[ -z ${" << prefix << "ROOT+CMT} ] || unset " << prefix << "ROOT" << endl; 7505 cout << "[ -z ${" << prefix << "CONFIG+CMT} ] || unset " << prefix << "CONFIG" << endl; 7506 // cout << "unset " << prefix << "ROOT" << endl; 7507 // cout << "unset " << prefix << "CONFIG" << endl; 7506 7508 } 7507 7509 break; … … 7540 7542 break; 7541 7543 case Sh : 7542 cout << "unset " << prefix << "ROOT" << endl; 7543 cout << "unset " << prefix << "CONFIG" << endl; 7544 cout << "[ -z ${" << prefix << "ROOT+CMT} ] || unset " << prefix << "ROOT" << endl; 7545 cout << "[ -z ${" << prefix << "CONFIG+CMT} ] || unset " << prefix << "CONFIG" << endl; 7546 // cout << "unset " << prefix << "ROOT" << endl; 7547 // cout << "unset " << prefix << "CONFIG" << endl; 7544 7548 break; 7545 7549 case Bat : … … 7557 7561 break; 7558 7562 case Sh : 7559 cout << "unset CMTEXTRATAGS" << endl; 7563 cout << "[ -z ${CMTEXTRATAGS+CMT} ] || unset CMTEXTRATAGS" << endl; 7564 // cout << "unset CMTEXTRATAGS" << endl; 7560 7565 break; 7561 7566 case Bat : -
CMT/HEAD/source/cmt_symbol.cxx
r599 r603 1641 1641 break; 1642 1642 case Sh : 1643 cout << "unset " << _name; 1643 cout << "[ -z ${" << _name << "+CMT} ] || unset " << _name; 1644 // cout << "unset " << _name; 1644 1645 result = 1; 1645 1646 break; … … 1658 1659 break; 1659 1660 case Sh : 1660 cout << "unset " << name; 1661 cout << "[ -z ${" << name << "+CMT} ] || unset " << name; 1662 // cout << "unset " << name; 1661 1663 result = 1; 1662 1664 break; … … 1753 1755 break; 1754 1756 case Sh : 1755 if (empty) cout << "unset " << _name; 1757 if (empty) cout << "[ -z ${" << _name << "+CMT} ] || unset " << _name; 1758 // if (empty) cout << "unset " << _name; 1756 1759 else cout << _name << "=\"" << temp << "\"; export " << _name; 1757 1760 //else cout << name << "=" << CmtSystem::quote (temp, " \t") << "; export " << name;
Note: See TracChangeset
for help on using the changeset viewer.