Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ECF25EA40 for ; Wed, 5 Dec 2012 18:24:42 +0000 (UTC) Received: (qmail 3918 invoked by uid 500); 5 Dec 2012 18:24:42 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 3883 invoked by uid 500); 5 Dec 2012 18:24:41 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 3847 invoked by uid 99); 5 Dec 2012 18:24:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Dec 2012 18:24:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BCF91818E1F; Wed, 5 Dec 2012 18:24:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tvansteenburgh@apache.org To: allura-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: Fix for missing options object and continue option Message-Id: <20121205182440.BCF91818E1F@tyr.zones.apache.org> Date: Wed, 5 Dec 2012 18:24:40 +0000 (UTC) Fix for missing options object and continue option Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/186d3667 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/186d3667 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/186d3667 Branch: refs/heads/master Commit: 186d366721f0f810cb8f357aba55253c632321c8 Parents: fac00c4 Author: Jon Schewe Authored: Thu Nov 29 19:55:55 2012 -0600 Committer: Jon Schewe Committed: Thu Nov 29 19:55:55 2012 -0600 ---------------------------------------------------------------------- scripts/allura_import.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/186d3667/scripts/allura_import.py ---------------------------------------------------------------------- diff --git a/scripts/allura_import.py b/scripts/allura_import.py index e90b07e..22e8740 100644 --- a/scripts/allura_import.py +++ b/scripts/allura_import.py @@ -49,13 +49,13 @@ def main(): # import the tracker (if any) if options.tracker: - import_tracker(cli, options.project, options.tracker, import_options, doc_txt, + import_tracker(cli, options.project, options.tracker, import_options, options, doc_txt, validate=options.validate, verbose=options.verbose) elif options.forum: import_forum(cli, options.project, options.forum, user_map, doc_txt, validate=options.validate) -def import_tracker(cli, project, tool, import_options, doc_txt, validate=True, verbose=False): +def import_tracker(cli, project, tool, import_options, options, doc_txt, validate=True, verbose=False): url = '/rest/p/' + project + '/' + tool if validate: url += '/validate_import' @@ -111,6 +111,7 @@ Import project data dump in JSON format into an Allura project.''') optparser.add_option('--user-map', dest='user_map_file', help='Map original users to SF.net users', metavar='JSON_FILE') optparser.add_option('--validate', dest='validate', action='store_true', help='Validate import data') optparser.add_option('-v', '--verbose', dest='verbose', action='store_true', help='Verbose operation') + optparser.add_option('-c', '--continue', dest='cont', action='store_true', help='Continue import into existing tracker') options, args = optparser.parse_args() if len(args) != 1: optparser.error("Wrong number of arguments") @@ -123,3 +124,4 @@ Import project data dump in JSON format into an Allura project.''') if __name__ == '__main__': main() +