Implement the -U option. (Steve Leblanc)

1 files changed, 15 insertions, 3 deletions

diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index 84882f4..0be6653 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -542,6 +542,14 @@ def options_init():
 	short = 'u', long = ['up', 'search-up'],
 	help = "Search up directory tree for SConstruct.")
 
+    def opt_U(opt, arg):
+        global climb_up
+        climb_up = 2
+
+    Option(func = opt_U,
+	short = 'U',
+	help = "Search up directory tree for SConstruct.")
+
     def option_v(opt, arg):
         import SCons
 	print "SCons by Steven Knight et al.:"
@@ -721,12 +729,16 @@ def _main():
 	print UsageString()
 	sys.exit(0)
 
+    if target_top:
+        if climb_up == 2 and not targets:
+            # -U with default targets
+            target_top = None
+        else:
+            target_top = SCons.Node.FS.default_fs.Dir(target_top)
+
     if not targets:
         targets = SCons.Script.SConscript.default_targets
 
-    if target_top:
-        target_top = SCons.Node.FS.default_fs.Dir(target_top)
-
     def Entry(x, top = target_top):
         if isinstance(x, SCons.Node.Node):
             node = x