Bug 451390, In comm-central <client.py>, add an |options.skip_ldap|
authorJustin Wood <Callek@gmail.com>
Fri, 26 Sep 2008 18:19:18 -0400
changeset 445 fff1a4dbb400dced6189fbef33f56742816b9495
parent 444 60bc2bb36c493bc65f2f163f3113c0a58ffde468
child 446 9286d1809f7b2f2aec4941b8236facf5b754ab5d
push idunknown
push userunknown
push dateunknown
bugs451390
Bug 451390, In comm-central <client.py>, add an |options.skip_ldap| r=pending
client.py
--- a/client.py
+++ b/client.py
@@ -114,16 +114,19 @@ o.add_option("--skip-inspector", dest="s
              help="Skip pulling the DOM inspector repository.")
 o.add_option("--inspector-rev", dest="inspector_rev",
              default=DEFAULT_INSPECTOR_REV,
              help="Revision of DOM inspector repository to update to. Default: \"" + DEFAULT_INSPECTOR_REV + "\"")
 
 o.add_option("--skip-cvs", dest="skip_cvs",
              action="store_true", default=False,
              help="Skip pulling the old directories from the Mozilla CVS repository.")
+o.add_option("--skip-ldap", dest="skip_ldap",
+             action="store_true", default=False,
+             help="Skip pulling LDAP from the Mozilla CVS repository.")
 o.add_option("--skip-chatzilla", dest="skip_chatzilla",
              action="store_true", default=False,
              help="Skip pulling the ChatZilla repository.")
 o.add_option("--skip-venkman", dest="skip_venkman",
              action="store_true", default=False,
              help="Skip pulling the Venkman repository.")
 
 o.add_option("--hg", dest="hg", default=os.environ.get('HG', 'hg'),
@@ -179,17 +182,18 @@ if action in ('checkout', 'co'):
 
     if not options.skip_mozilla:
         do_hg_pull('mozilla', options.mozilla_repo, options.hg, options.mozilla_rev)
 
     if not options.skip_inspector:
         do_hg_pull(os.path.join('mozilla', 'extensions', 'inspector'), options.inspector_repo, options.hg, options.inspector_rev)
 
     if not options.skip_cvs:
-        do_cvs_checkout(LDAPCSDK_DIRS, LDAPCSDK_CO_TAG, options.cvsroot, options.cvs, '')
+        if not options.skip_ldap:
+          do_cvs_checkout(LDAPCSDK_DIRS, LDAPCSDK_CO_TAG, options.cvsroot, options.cvs, '')
         if os.path.exists(os.path.join(topsrcdir, 'mozilla', 'extensions')):
           do_cvs_checkout(EXTENSION_DIRS, EXTENSION_CO_TAG, options.cvsroot, options.cvs, 'mozilla')
         else:
           print >>sys.stderr, "Warning: mozilla/extensions does not exist, built-in extensions could not be checked out."
           pass
 
     if not options.skip_chatzilla:
         if os.path.exists(os.path.join(topsrcdir, 'mozilla', 'extensions')):