jhbuild r1859 - in trunk: . jhbuild jhbuild/commands jhbuild/modtypes

[fpeters svn gnome org]

Author: fpeters
Date: Sun Jan 20 14:28:46 2008
New Revision: 1859
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1859&view=rev

Log:
* jhbuild/commands/base.py, jhbuild/defaults.jhbuildrc,
jhbuild/config.py, jhbuild/modtypes/__init__.py: removed force_policy
configure option; force build_policy to 'all' when --force-policy is
passed to build or buildone options.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/commands/base.py
   trunk/jhbuild/config.py
   trunk/jhbuild/defaults.jhbuildrc
   trunk/jhbuild/modtypes/__init__.py

Modified: trunk/jhbuild/commands/base.py
==============================================================================
--- trunk/jhbuild/commands/base.py	(original)
+++ trunk/jhbuild/commands/base.py	Sun Jan 20 14:28:46 2008
@@ -192,7 +192,7 @@
         if options.quiet:
             config.quiet_mode = True
         if options.force_policy:
-            config.force_policy = True
+            config.build_policy = 'all'
 
         module_set = jhbuild.moduleset.load(config)
         module_list = module_set.get_module_list(args or config.modules,
@@ -265,7 +265,7 @@
         if options.quiet:
             config.quiet_mode = True
         if options.force_policy:
-            config.force_policy = True
+            config.build_policy = 'all'
 
         module_set = jhbuild.moduleset.load(config)
         try:

Modified: trunk/jhbuild/config.py
==============================================================================
--- trunk/jhbuild/config.py	(original)
+++ trunk/jhbuild/config.py	Sun Jan 20 14:28:46 2008
@@ -39,7 +39,7 @@
                 'tarballdir', 'pretty_print', 'svn_program', 'makedist',
                 'makedistcheck', 'nonotify', 'cvs_program',
                 'checkout_mode', 'copy_dir', 'module_checkout_mode',
-                'build_policy', 'force_policy', 'trycheckout',
+                'build_policy', 'trycheckout',
                 'nopoison', 'makecheck_advisory',
                 'quiet_mode', 'progress_bar']
 

Modified: trunk/jhbuild/defaults.jhbuildrc
==============================================================================
--- trunk/jhbuild/defaults.jhbuildrc	(original)
+++ trunk/jhbuild/defaults.jhbuildrc	Sun Jan 20 14:28:46 2008
@@ -56,7 +56,6 @@
 makedistcheck = False  # run make distcheck after building
 trycheckout   = False  # try to force checkout and autogen on failure
 nopoison      = False  # don't poison modules on failure
-force_policy  = False  # Whether to override specified build policy
 
 makecheck_advisory = False # whether to pass over 'make check' failures
 

Modified: trunk/jhbuild/modtypes/__init__.py
==============================================================================
--- trunk/jhbuild/modtypes/__init__.py	(original)
+++ trunk/jhbuild/modtypes/__init__.py	Sun Jan 20 14:28:46 2008
@@ -175,8 +175,6 @@
             return (self._next_state(buildscript, state), None, None)
 
     def check_build_policy(self, buildscript):
-        if buildscript.config.force_policy:
-            return
         if not buildscript.config.build_policy in ('updated', 'updated-deps'):
             return
         if not buildscript.packagedb.check(self.name, self.get_revision() or ''):