jhbuild r2106 - in trunk: . modulesets patches

[gjc svn gnome org]

Author: gjc
Date: Tue May 20 16:41:02 2008
New Revision: 2106
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2106&view=rev

Log:
Bug 533978 â WAF bootstrap fails

Added:
   trunk/patches/waf-install.patch
Modified:
   trunk/ChangeLog
   trunk/modulesets/bootstrap.modules

Modified: trunk/modulesets/bootstrap.modules
==============================================================================
--- trunk/modulesets/bootstrap.modules	(original)
+++ trunk/modulesets/bootstrap.modules	Tue May 20 16:41:02 2008
@@ -83,7 +83,9 @@
 
   <autotools id="waf" autogen-sh="utils/autogen.sh">
     <branch repo="waf" module="waf-1.4.2.tar.bz2" version="1.4.2"
-            size="360861" md5sum="0d0c397ee675b2df79f65b375eb8a0f8" />
+            size="360861" md5sum="0d0c397ee675b2df79f65b375eb8a0f8">
+      <patch file="waf-install.patch" strip="1" />
+    </branch>
     <dependencies>
       <dep package="python"/>
     </dependencies>

Added: trunk/patches/waf-install.patch
==============================================================================
--- (empty file)
+++ trunk/patches/waf-install.patch	Tue May 20 16:41:02 2008
@@ -0,0 +1,15 @@
+Fix stupid prompt for WAF installation.
+
+--- waf-1.4.2/wscript	2008-05-20 15:32:51 +0000
++++ waf-1.4.2/wscript	2008-05-20 15:33:28 +0000
+@@ -286,9 +286,6 @@
+ 		print "Installing Waf on Windows is not possible."
+ 		sys.exit(0)
+ 
+-	val = raw_input("Installing Waf is discouraged. Proceed? [y/n]")
+-	if val != "y": sys.exit(1)
+-
+ 	destdir = None
+ 	if "DESTDIR" in os.environ:
+ 		destdir = os.environ["DESTDIR"]
+