Ignore CC_LIST when private flag is specified.

gcl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
@@ skipping 860 matching lines @@
       os.write(handle, change_info.description)
       os.close(handle)
 
       # Watchlist processing -- CC people interested in this changeset
       # http://dev.chromium.org/developers/contributing-code/watchlists
       if not no_watchlists:
         import watchlists
         watchlist = watchlists.Watchlists(change_info.GetLocalRoot())
         watchers = watchlist.GetWatchersForPaths(change_info.GetFileNames())
 
-      cc_list = GetCodeReviewSetting("CC_LIST")
+      # We check this before applying the "PRIVATE" parameter of codereview
+      # settings assuming that the author of the settings file has put
+      # addresses which we can send private CLs to, and so we should ignore
+      # CC_LIST only when --private is specified explicitly on the command
+      # line.
+      if "--private" in upload_arg:
+        Warn("WARNING: CC_LIST is ignored since private flag is specified.  "
+             "You need to review and add them manually if necessary.")
+        cc_list = ""
+      else:
+        cc_list = GetCodeReviewSetting("CC_LIST")
       if not no_watchlists and watchers:
         # Filter out all empty elements and join by ','
         cc_list = ','.join(filter(None, [cc_list] + watchers))
       if cc_list:
         upload_arg.append("--cc=" + cc_list)
       upload_arg.append("--file=%s" % desc_file)
 
       if GetCodeReviewSetting("PRIVATE") == "True":
         upload_arg.append("--private")
 
@@ skipping 575 matching lines @@
       raise
     print >> sys.stderr, (
         'AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
         'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))
     return 1
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))