Changeset 603

Timestamp:

Jan 27, 2012, 4:47:18 PM (12 years ago)

Author:

rybkin

Message:

See C.L. 478

Location:

CMT/HEAD

Files:

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

CMT/HEAD/ChangeLog

@@ +1 @@
+2012-01-27    <rybkin@lal.in2p3.fr> 478
+
+        * source/cmt_parser.cxx: In class Cmt function print_clean, use unset on
+        set variables only to work around Z Shell unset builtin command being POSIX
+        non-conformant (exit code of 1 on unset variables)
+        * source/cmt_symbol.cxx: In class Symbol functions print_clean, print, idem
+        
 2012-01-06    <rybkin@lal.in2p3.fr> 477
 

CMT/HEAD/source/cmt_parser.cxx

@@ -7502 +7502 @@
       if (Me.m_current_package != "CMT")
         {
-          cout << "unset " << prefix << "ROOT" << endl;
-          cout << "unset " << prefix << "CONFIG" << endl;
+          cout << "[ -z ${" << prefix << "ROOT+CMT} ] || unset " << prefix << "ROOT" << endl;
+          cout << "[ -z ${" << prefix << "CONFIG+CMT} ] || unset " << prefix << "CONFIG" << endl;
+          //          cout << "unset " << prefix << "ROOT" << endl;
+          //          cout << "unset " << prefix << "CONFIG" << endl;
         }
       break;
@@ -7540 +7542 @@
               break;
             case Sh :
-              cout << "unset " << prefix << "ROOT" << endl;
-              cout << "unset " << prefix << "CONFIG" << endl;
+              cout << "[ -z ${" << prefix << "ROOT+CMT} ] || unset " << prefix << "ROOT" << endl;
+              cout << "[ -z ${" << prefix << "CONFIG+CMT} ] || unset " << prefix << "CONFIG" << endl;
+          //              cout << "unset " << prefix << "ROOT" << endl;
+          //              cout << "unset " << prefix << "CONFIG" << endl;
               break;
             case Bat :
@@ -7557 +7561 @@
       break;
     case Sh :
-      cout << "unset CMTEXTRATAGS" << endl;
+      cout << "[ -z ${CMTEXTRATAGS+CMT} ] || unset CMTEXTRATAGS" << endl;
+              //      cout << "unset CMTEXTRATAGS" << endl;
       break;
     case Bat :

CMT/HEAD/source/cmt_symbol.cxx

@@ -1641 +1641 @@
           break;
         case Sh :
-          cout << "unset " << _name;
+          cout << "[ -z ${" << _name << "+CMT} ] || unset " << _name;
+          //          cout << "unset " << _name;
           result = 1;
           break;
@@ -1658 +1659 @@
             break;
           case Sh :
-            cout << "unset " << name;
+            cout << "[ -z ${" << name << "+CMT} ] || unset " << name;
+          //            cout << "unset " << name;
             result = 1;
             break;
@@ -1753 +1755 @@
               break;
             case Sh :
-              if (empty) cout << "unset " << _name;
+              if (empty) cout << "[ -z ${" << _name << "+CMT} ] || unset " << _name;
+              //              if (empty) cout << "unset " << _name;
               else cout << _name << "=\"" << temp << "\"; export " << _name;
               //else cout << name << "=" << CmtSystem::quote (temp, " \t") << "; export " << name;