From a93e764b5e9971e12af8cee516cbef184ae3a18e Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sun, 17 Nov 2013 13:48:30 -0800 Subject: [PATCH] Bug 937984: Allow client.py to pull NSPR and NSS from a user-specified repo, r=kaie --HG-- extra : rebase_source : 86b2cf24d3f425eab893e2cb0096e2439f30b357 --- client.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/client.py b/client.py index af760609ccc..da08b1a1319 100755 --- a/client.py +++ b/client.py @@ -131,6 +131,8 @@ o.add_option("--cvsroot", dest="cvsroot", help="The CVSROOT for libffi (default : %s)" % CVSROOT_LIBFFI) o.add_option("--hg", dest="hg", default=os.environ.get('HG', 'hg'), help="The location of the hg binary") +o.add_option("--repo", dest="repo", + help="the repo to update from (default: upstream repo)") try: options, args = o.parse_args() @@ -145,11 +147,15 @@ if action in ('checkout', 'co'): elif action in ('update_nspr'): tag, = args[1:] depfile = "nsprpub/config/prdepend.h" - update_nspr_or_nss(tag, depfile, 'nsprpub', 'https://hg.mozilla.org/projects/nspr') + if not options.repo: + options.repo = 'https://hg.mozilla.org/projects/nspr' + update_nspr_or_nss(tag, depfile, 'nsprpub', options.repo) elif action in ('update_nss'): tag, = args[1:] depfile = "security/nss/coreconf/coreconf.dep" - update_nspr_or_nss(tag, depfile, 'security/nss', 'https://hg.mozilla.org/projects/nss') + if not options.repo: + options.repo = 'https://hg.mozilla.org/projects/nss' + update_nspr_or_nss(tag, depfile, 'security/nss', options.repo) elif action in ('update_libffi'): tag, = args[1:] if not options.cvsroot: