[Cmake-commits] CMake branch, next, updated. v2.8.9-90-g1cba5d0

[Rolf Eike Beer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1cba5d0c159fa0219a968297c3ca97e08f5de3e6 (commit)
       via  52d9c38e72a458bd3575aefab02694d5916bfd91 (commit)
      from  d6937051a5b09f703249fd3f9235394641f24747 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1cba5d0c159fa0219a968297c3ca97e08f5de3e6
commit 1cba5d0c159fa0219a968297c3ca97e08f5de3e6
Merge: d693705 52d9c38
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Aug 15 16:24:59 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 15 16:24:59 2012 -0400

    Merge topic 'list-command-argument-fixes' into next
    
    52d9c38 list command: error on too many arguments


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52d9c38e72a458bd3575aefab02694d5916bfd91
commit 52d9c38e72a458bd3575aefab02694d5916bfd91
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Aug 15 22:12:12 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Aug 15 22:12:12 2012 +0200

    list command: error on too many arguments
    
    SORT, REVERSE, and REMOVE_DUPLICATES can only operate on exactly one argument.
    Until now all other arguments were silently ignored. Give an error instead.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 9d4f175..7848424 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -429,6 +429,12 @@ bool cmListCommand
     this->SetError("sub-command REVERSE requires a list as an argument.");
     return false;
     }
+  else if(args.size() > 2)
+    {
+    this->SetError(
+      "sub-command REVERSE only takes one argument.");
+    return false;
+    }
 
   const std::string& listName = args[1];
   // expand the variable
@@ -463,6 +469,12 @@ bool cmListCommand
       "sub-command REMOVE_DUPLICATES requires a list as an argument.");
     return false;
     }
+  else if(args.size() > 2)
+    {
+    this->SetError(
+      "sub-command REMOVE_DUPLICATES only takes one argument.");
+    return false;
+    }
 
   const std::string& listName = args[1];
   // expand the variable
@@ -506,6 +518,12 @@ bool cmListCommand
     this->SetError("sub-command SORT requires a list as an argument.");
     return false;
     }
+  else if(args.size() > 2)
+    {
+    this->SetError(
+      "sub-command SORT only takes one argument.");
+    return false;
+    }
 
   const std::string& listName = args[1];
   // expand the variable

-----------------------------------------------------------------------

Summary of changes:
 Source/cmListCommand.cxx |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake