Disable the cluster-merge tool for the moment

Hopefully this can be fixed before the final 2.4 release…

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>
Reviewed-by: Stephen Shirley <diamond@google.com>

diff --git a/tools/cluster-merge b/tools/cluster-merge
index 412280b..4fc63ff 100755 (executable)
--- a/tools/cluster-merge
+++ b/tools/cluster-merge
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 
-# Copyright (C) 2010 Google Inc.
+# Copyright (C) 2010, 2011 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -492,6 +492,9 @@ def main():
 
   (options, args) = parser.parse_args()
 
+  parser.error("Unfortunately this tool is currently broken and cannot"
+               " be used. Sorry!")
+
   SetupLogging(options)
 
   if not args: