jhbuild r2339 - in trunk: . doc doc/C jhbuild/commands

[cskeogh svn gnome org]

Author: cskeogh
Date: Fri Sep  5 09:34:57 2008
New Revision: 2339
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2339&view=rev

Log:
* jhbuild/commands/tinderbox.py: Support -f force for tinderbox too.
  (closes: #549889)
* C/jhbuild.xml: Support -f force for tinderbox too.  (closes: #549889)


Modified:
   trunk/ChangeLog
   trunk/doc/C/jhbuild.xml
   trunk/doc/ChangeLog
   trunk/jhbuild/commands/tinderbox.py

Modified: trunk/doc/C/jhbuild.xml
==============================================================================
--- trunk/doc/C/jhbuild.xml	(original)
+++ trunk/doc/C/jhbuild.xml	Fri Sep  5 09:34:57 2008
@@ -1050,14 +1050,15 @@
 	<arg>-D <replaceable>date</replaceable></arg>
 	<arg>-C</arg>
 	<arg>-N</arg>
+	<arg>-f</arg>
 	<arg rep="repeat">module</arg>
       </cmdsynopsis>
 
       <para>The <option>--autogen</option>, <option>--clean</option>,
       <option>--no-network</option>, <option>--skip</option>,
       <option>--start-at</option>, <option>-D</option>,
-      <option>-C</option> and <option>-N</option> options are
-      processed the same as for <command>build</command>.</para>
+      <option>-C</option>, <option>-N</option> and <option>-f</option>
+      options are processed the same as for <command>build</command>.</para>
 
       <variablelist>
 	<varlistentry>

Modified: trunk/jhbuild/commands/tinderbox.py
==============================================================================
--- trunk/jhbuild/commands/tinderbox.py	(original)
+++ trunk/jhbuild/commands/tinderbox.py	Fri Sep  5 09:34:57 2008
@@ -58,7 +58,10 @@
                         help=_('try to force checkout and autogen on failure')),
             make_option('-N', '--no-poison',
                         action='store_true', dest='nopoison', default=False,
-                        help=_("don't poison modules on failure"))
+                        help=_("don't poison modules on failure")),
+            make_option('-f', '--force',
+                        action='store_true', dest='force_policy', default=False,
+                        help=_('build even if policy says not to'))
             ])
 
     def run(self, config, options, args):
@@ -80,6 +83,8 @@
             config.trycheckout = True
         if options.nopoison:
             config.nopoison = True
+        if options.force_policy:
+            config.build_policy = 'all'
 
         if not config.tinderbox_outputdir:
             raise UsageError(_('output directory for tinderbox build not specified'))