GNOME.org
 

[jhbuild] Fixed calls to Command.run(), broken by ee4bf954709024d0 (GNOME bug 608875)

commit 49e02db2448d341103cf14387a3e7c259b806531
Author: Frédéric Péters <fpeters 0d be>
Date:   Wed Feb 3 11:06:36 2010 +0100

    Fixed calls to Command.run(), broken by ee4bf954709024d0 (GNOME bug 608875)

 jhbuild/commands/autobuild.py       |    4 ++--
 jhbuild/commands/base.py            |   16 ++++++++--------
 jhbuild/commands/bootstrap.py       |    2 +-
 jhbuild/commands/bot.py             |    2 +-
 jhbuild/commands/checkbranches.py   |    2 +-
 jhbuild/commands/checkmodulesets.py |    2 +-
 jhbuild/commands/clean.py           |    2 +-
 jhbuild/commands/gui.py             |    2 +-
 jhbuild/commands/info.py            |    2 +-
 jhbuild/commands/rdepends.py        |    2 +-
 jhbuild/commands/sanitycheck.py     |    2 +-
 jhbuild/commands/snapshot.py        |    2 +-
 jhbuild/commands/tinderbox.py       |    2 +-
 jhbuild/commands/uninstall.py       |    2 +-
 14 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/jhbuild/commands/autobuild.py b/jhbuild/commands/autobuild.py
index 16851c3..e5c5931 100644
--- a/jhbuild/commands/autobuild.py
+++ b/jhbuild/commands/autobuild.py
@@ -49,8 +49,8 @@ class cmd_autobuild(Command):
                         action='store_true', dest='verbose', default=False,
                         help=_('verbose mode')),
             ])
-    
-    def run(self, config, options, args):
+
+    def run(self, config, options, args, help=None):
         config.buildscript = 'autobuild'
 
         config.autobuild_report_url = None
diff --git a/jhbuild/commands/base.py b/jhbuild/commands/base.py
index 1f53cbb..d746604 100644
--- a/jhbuild/commands/base.py
+++ b/jhbuild/commands/base.py
@@ -58,7 +58,7 @@ class cmd_update(Command):
                         help=_('ignore all soft-dependencies')),
             ])
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         config.set_from_cmdline_options(options)
         module_set = jhbuild.moduleset.load(config)
         module_list = module_set.get_module_list(args or config.modules,
@@ -94,7 +94,7 @@ class cmd_updateone(Command):
                         help=_('set a sticky date when checking out modules')),
             ])
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         config.set_from_cmdline_options(options)
         module_set = jhbuild.moduleset.load(config)
         try:
@@ -128,7 +128,7 @@ class cmd_cleanone(Command):
                         help=_('honour the makeclean setting in config file')),
             ])
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         if options.honour_config is False:
             config.makeclean = True
         module_set = jhbuild.moduleset.load(config)
@@ -266,7 +266,7 @@ class cmd_build(Command):
                         help=_('skip modules installed less than the given time ago')),
             ])
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         config.set_from_cmdline_options(options)
 
         if not config.quiet_mode:
@@ -339,7 +339,7 @@ class cmd_buildone(Command):
                         help=_('skip modules installed less than the given time ago')),
             ])
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         config.set_from_cmdline_options(options)
 
         if not config.quiet_mode:
@@ -389,7 +389,7 @@ class cmd_run(Command):
             raise FatalError(_("Unable to execute the command '%(command)s': %(err)s") % {
                     'command':args[0], 'err':str(exc)})
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         if options.in_builddir:
             module_set = jhbuild.moduleset.load(config)
             try:
@@ -482,7 +482,7 @@ class cmd_list(Command):
                         help=_('list all modules, not only those that would be built')),
             ])
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         config.set_from_cmdline_options(options)
         module_set = jhbuild.moduleset.load(config)
         if options.list_all_modules:
@@ -529,7 +529,7 @@ class cmd_dot(Command):
                         help=_('group modules from metamodule together')),
             ])
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         module_set = jhbuild.moduleset.load(config)
         if args:
             modules = args
diff --git a/jhbuild/commands/bootstrap.py b/jhbuild/commands/bootstrap.py
index 3c81ac7..00aee3e 100644
--- a/jhbuild/commands/bootstrap.py
+++ b/jhbuild/commands/bootstrap.py
@@ -42,7 +42,7 @@ class cmd_bootstrap(cmd_build):
                         action='store_true', dest='ignore_system', default=False,
                         help=_('do not use system installed modules')))
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         config.moduleset = 'bootstrap'
         # load the bootstrap module set
         if not args:
diff --git a/jhbuild/commands/bot.py b/jhbuild/commands/bot.py
index 68bc348..4db7b3b 100644
--- a/jhbuild/commands/bot.py
+++ b/jhbuild/commands/bot.py
@@ -99,7 +99,7 @@ class cmd_bot(Command):
                         help=_('exec a buildbot step (internal use only)')),
             ])
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         if options.setup:
             return self.setup(config)
 
diff --git a/jhbuild/commands/checkbranches.py b/jhbuild/commands/checkbranches.py
index 32b446d..d1c0b33 100644
--- a/jhbuild/commands/checkbranches.py
+++ b/jhbuild/commands/checkbranches.py
@@ -33,7 +33,7 @@ class cmd_checkbranches(Command):
             make_option('-b', '--branch', metavar = 'BRANCH',
                     action = 'store', dest = 'branch', default = None)])
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         if options.branch:
             branch = options.branch
         else:
diff --git a/jhbuild/commands/checkmodulesets.py b/jhbuild/commands/checkmodulesets.py
index 1745b9f..fae684b 100644
--- a/jhbuild/commands/checkmodulesets.py
+++ b/jhbuild/commands/checkmodulesets.py
@@ -30,7 +30,7 @@ class cmd_checkmodulesets(Command):
     doc = N_('Check if modules in jhbuild have the correct definition')
     name = 'checkmodulesets'
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         module_set = jhbuild.moduleset.load(config)
         module_list = module_set.get_full_module_list()
         for mod in module_list:
diff --git a/jhbuild/commands/clean.py b/jhbuild/commands/clean.py
index 5b8d714..6384a51 100644
--- a/jhbuild/commands/clean.py
+++ b/jhbuild/commands/clean.py
@@ -41,7 +41,7 @@ class cmd_clean(Command):
                         help=_('start building at the given module')),
             ])
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         for item in options.skip:
             config.skip += item.split(',')
 
diff --git a/jhbuild/commands/gui.py b/jhbuild/commands/gui.py
index a441a8e..4529e49 100644
--- a/jhbuild/commands/gui.py
+++ b/jhbuild/commands/gui.py
@@ -32,7 +32,7 @@ class cmd_gui(Command):
     name = 'gui'
     usage_args = ''
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         # request GTK build script.
         config.buildscript = 'gtkui'
 
diff --git a/jhbuild/commands/info.py b/jhbuild/commands/info.py
index 78da963..ff073a9 100644
--- a/jhbuild/commands/info.py
+++ b/jhbuild/commands/info.py
@@ -40,7 +40,7 @@ class cmd_info(Command):
     usage_args = N_('[ modules ... ]')
 
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         packagedb = jhbuild.frontends.get_buildscript(config, []).packagedb
         module_set = jhbuild.moduleset.load(config)
 
diff --git a/jhbuild/commands/rdepends.py b/jhbuild/commands/rdepends.py
index 0543398..5767403 100644
--- a/jhbuild/commands/rdepends.py
+++ b/jhbuild/commands/rdepends.py
@@ -40,7 +40,7 @@ class cmd_rdepends(Command):
                         help=_('limit display to modules directly depending on given module'))
             ])
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         module_set = jhbuild.moduleset.load(config)
 
         if not args:
diff --git a/jhbuild/commands/sanitycheck.py b/jhbuild/commands/sanitycheck.py
index c77d013..68abb7c 100644
--- a/jhbuild/commands/sanitycheck.py
+++ b/jhbuild/commands/sanitycheck.py
@@ -54,7 +54,7 @@ class cmd_sanitycheck(Command):
     name = 'sanitycheck'
     usage_args = ''
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         if args:
             raise UsageError(_('no extra arguments expected'))
     
diff --git a/jhbuild/commands/snapshot.py b/jhbuild/commands/snapshot.py
index c2b8259..17a67cd 100644
--- a/jhbuild/commands/snapshot.py
+++ b/jhbuild/commands/snapshot.py
@@ -37,7 +37,7 @@ class cmd_snapshot(Command):
     def __init__(self):
         Command.__init__(self)
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         module_set = jhbuild.moduleset.load(config)
         module_list = module_set.get_module_list(args or config.modules,
                                                  config.skip)
diff --git a/jhbuild/commands/tinderbox.py b/jhbuild/commands/tinderbox.py
index 9049beb..d22065d 100644
--- a/jhbuild/commands/tinderbox.py
+++ b/jhbuild/commands/tinderbox.py
@@ -64,7 +64,7 @@ class cmd_tinderbox(Command):
                         help=_('build even if policy says not to'))
             ])
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         config.set_from_cmdline_options(options)
         config.buildscript = 'tinderbox'
 
diff --git a/jhbuild/commands/uninstall.py b/jhbuild/commands/uninstall.py
index 917e712..5e1570f 100644
--- a/jhbuild/commands/uninstall.py
+++ b/jhbuild/commands/uninstall.py
@@ -31,7 +31,7 @@ class cmd_uninstall(Command):
     name = 'uninstall'
     usage_args = N_('[ modules ... ]')
 
-    def run(self, config, options, args):
+    def run(self, config, options, args, help=None):
         config.set_from_cmdline_options(options)
 
         module_set = jhbuild.moduleset.load(config)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]