[Python-apps-commits] r3849 - in packages/waf/trunk/debian (3 files)

[dktrkranz at users.alioth.debian.org]

    Date: Saturday, September 26, 2009 @ 02:19:35
  Author: dktrkranz
Revision: 3849

Allow single nodes in bld.install_files (Closes: #548329)

Added:
  packages/waf/trunk/debian/patches/bld.install_files.patch
Modified:
  packages/waf/trunk/debian/changelog
  packages/waf/trunk/debian/patches/series

Modified: packages/waf/trunk/debian/changelog
===================================================================
--- packages/waf/trunk/debian/changelog	2009-09-25 21:29:17 UTC (rev 3848)
+++ packages/waf/trunk/debian/changelog	2009-09-26 02:19:35 UTC (rev 3849)
@@ -1,3 +1,10 @@
+waf (1.5.9+dfsg-2) UNRELEASED; urgency=low
+
+  * debian/patches/bld.install_files.patch:
+    - Allow single nodes in bld.install_files (Closes: #548329).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sat, 26 Sep 2009 04:03:03 +0200
+
 waf (1.5.9+dfsg-1) unstable; urgency=low
 
   * New upstream release.

Added: packages/waf/trunk/debian/patches/bld.install_files.patch
===================================================================
--- packages/waf/trunk/debian/patches/bld.install_files.patch	                        (rev 0)
+++ packages/waf/trunk/debian/patches/bld.install_files.patch	2009-09-26 02:19:35 UTC (rev 3849)
@@ -0,0 +1,41 @@
+Description:	Allow single nodes in bld.install_files
+Bug-Debian:	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=548329
+Origin:		Upstream
+Forwarded:	http://code.google.com/p/waf/source/detail?r=6728#
+
+Index: waf-1.5.9+dfsg/wafadmin/Build.py
+===================================================================
+--- waf-1.5.9+dfsg.orig/wafadmin/Build.py	2009-09-26 02:03:52.000000000 +0000
++++ waf-1.5.9+dfsg/wafadmin/Build.py	2009-09-26 02:03:27.000000000 +0000
+@@ -801,6 +801,9 @@
+ 		else:
+ 			lst = Utils.to_list(files)
+ 
++		if not getattr(lst, '__iter__', False):
++			lst = [lst]
++
+ 		destpath = self.get_install_path(path, env)
+ 
+ 		Utils.check_dir(destpath)
+Index: waf-1.5.9+dfsg/wafadmin/Tools/ccroot.py
+===================================================================
+--- waf-1.5.9+dfsg.orig/wafadmin/Tools/ccroot.py	2009-09-26 02:03:52.000000000 +0000
++++ waf-1.5.9+dfsg/wafadmin/Tools/ccroot.py	2009-09-26 02:03:48.000000000 +0000
+@@ -239,7 +239,7 @@
+ 	"""you may kill this method to inject your own installation for the first element
+ 	any other install should only process its own nodes and not those from the others"""
+ 	if self.install_path:
+-		self.bld.install_files(self.install_path, [self.link_task.outputs[0]], env=self.env, chmod=self.chmod)
++		self.bld.install_files(self.install_path, self.link_task.outputs[0], env=self.env, chmod=self.chmod)
+ 
+ @feature('cc', 'cxx')
+ @after('apply_type_vars', 'apply_lib_vars', 'apply_core')
+@@ -542,7 +542,7 @@
+ 
+ 	# install the dll in the bin dir
+ 	dll = self.link_task.outputs[0]
+-	self.bld.install_files(bindir, [dll], self.env, self.chmod)
++	self.bld.install_files(bindir, dll, self.env, self.chmod)
+ 
+ 	# add linker flags to generate the import lib
+ 	implib = self.env['implib_PATTERN'] % os.path.split(self.target)[1]

Modified: packages/waf/trunk/debian/patches/series
===================================================================
--- packages/waf/trunk/debian/patches/series	2009-09-25 21:29:17 UTC (rev 3848)
+++ packages/waf/trunk/debian/patches/series	2009-09-26 02:19:35 UTC (rev 3849)
@@ -2,3 +2,4 @@
 waf_stylesheet.patch
 unpack_in_cwd.patch
 intltool.patch
+bld.install_files.patch