jhbuild r2292 - in trunk: modulesets patches

[fpeters svn gnome org]

Author: fpeters
Date: Wed Aug 20 21:26:56 2008
New Revision: 2292
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2292&view=rev

Log:
* modulesets/bootstrap.modules, patches/waf-install.patch: updated
waf to 1.4.3.  (closes: #548607)



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

Modified: trunk/modulesets/bootstrap.modules
==============================================================================
--- trunk/modulesets/bootstrap.modules	(original)
+++ trunk/modulesets/bootstrap.modules	Wed Aug 20 21:26:56 2008
@@ -82,8 +82,8 @@
   </distutils>
 
   <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">
+    <branch repo="waf" module="waf-1.4.3.tar.bz2" version="1.4.3"
+            size="367896" md5sum="fb4acb46dbb612e911d7296282269743">
       <patch file="waf-install.patch" strip="1" />
     </branch>
     <dependencies>

Modified: trunk/patches/waf-install.patch
==============================================================================
--- trunk/patches/waf-install.patch	(original)
+++ trunk/patches/waf-install.patch	Wed Aug 20 21:26:56 2008
@@ -2,14 +2,13 @@
 
 --- 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)
+@@ -314,9 +314,6 @@
+ 			sys.exit(0)
  
--	val = raw_input("Installing Waf is discouraged. Proceed? [y/n]")
--	if val != "y": sys.exit(1)
+ 	if Params.g_commands['install']:
+-		val = Params.g_options.yes or (not sys.stdin.isatty() or raw_input("Installing Waf is discouraged. Proceed? [y/n]"))
+-		if val != True and val != "y": sys.exit(1)
 -
- 	destdir = None
- 	if "DESTDIR" in os.environ:
- 		destdir = os.environ["DESTDIR"]
-
+ 		compute_revision()
+ 
+ 		create_waf()