--- a/client.py
+++ b/client.py
@@ -1,18 +1,18 @@
#!/usr/bin/python
-CVS_CO_TAG = 'HEAD'
+CALENDAR_CO_TAG = 'HEAD'
EXTENSION_CO_TAG = 'HEAD'
LDAPCSDK_CO_TAG = 'LDAPCSDK_6_0_3_CLIENT_BRANCH'
CHATZILLA_CO_TAG = 'HEAD'
VENKMAN_CO_TAG = 'HEAD'
-CVS_DIRS = ('calendar',)
+CALENDAR_DIRS = ('calendar',)
EXTENSION_DIRS = ('extensions/typeaheadfind',
'extensions/wallet',
'extensions/webdav',)
LDAPCSDK_DIRS = ('directory/c-sdk',)
CHATZILLA_DIRS = ('extensions/irc',)
VENKMAN_DIRS = ('extensions/venkman',)
@@ -147,17 +147,18 @@ fixup_repo_options(options)
if action in ('checkout', 'co'):
if not options.skip_comm:
do_hg_pull('.', options.comm_repo, options.hg)
if not options.skip_mozilla:
do_hg_pull('mozilla', options.mozilla_repo, options.hg)
if not options.skip_cvs:
- do_cvs_checkout(CVS_DIRS, CVS_CO_TAG, options.cvsroot, options.cvs, '')
+ if not options.skip_calendar:
+ do_cvs_checkout(CALENDAR_DIRS, CALENDAR_CO_TAG, options.cvsroot, options.cvs, '')
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:
@@ -166,14 +167,14 @@ if action in ('checkout', 'co'):
else:
print >>sys.stderr, "Warning: mozilla/extensions does not exist, ChatZilla could not be checked out."
pass
if not options.skip_venkman:
if os.path.exists(os.path.join(topsrcdir, 'mozilla', 'extensions')):
do_cvs_checkout(VENKMAN_DIRS, VENKMAN_CO_TAG, options.cvsroot, options.cvs, 'mozilla')
else:
- print >>sys.stderr, "Warning: mozilla/extensions does not exist, ChatZilla could not be checked out."
+ print >>sys.stderr, "Warning: mozilla/extensions does not exist, Venkman could not be checked out."
pass
else:
o.print_help()
sys.exit(2)