incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tvansteenbu...@apache.org
Subject [2/3] git commit: Fix for missing options object and continue option
Date Wed, 05 Dec 2012 18:24:40 GMT
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 <jpschewe@mtu.net>
Authored: Thu Nov 29 19:55:55 2012 -0600
Committer: Jon Schewe <jpschewe@mtu.net>
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()
+


Mime
View raw message