rpms/waf/devel waf-1.4.2-fcntl.patch,NONE,1.1 waf.spec,1.5,1.6

[Thomas Moschny (thm)]

Author: thm

Update of /cvs/pkgs/rpms/waf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2003/devel

Modified Files:
	waf.spec 
Added Files:
	waf-1.4.2-fcntl.patch 
Log Message:
Patch: stdout might not be a terminal.

waf-1.4.2-fcntl.patch:

--- NEW FILE waf-1.4.2-fcntl.patch ---
--- waf-1.4.2/wafadmin/Utils.py	2008-05-16 17:43:19.000000000 +0200
+++ waf-1.4.2.fcntl/wafadmin/Utils.py	2008-05-26 09:23:19.000000000 +0200
@@ -154,10 +154,13 @@ except ImportError:
 		return 55
 else:
 	def get_term_cols():
-		dummy_lines, cols = struct.unpack("HHHH", \
-		fcntl.ioctl(sys.stdout.fileno(),termios.TIOCGWINSZ , \
-		struct.pack("HHHH", 0, 0, 0, 0)))[:2]
-		return cols
+		try:
+			dummy_lines, cols = struct.unpack("HHHH", \
+			fcntl.ioctl(sys.stdout.fileno(),termios.TIOCGWINSZ , \
+			struct.pack("HHHH", 0, 0, 0, 0)))[:2]
+			return cols
+		except IOError:
+			return 55
 
 def progress_line(state, total, col1, col2):
 	n = len(str(total))


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/waf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- waf.spec	26 May 2008 07:04:16 -0000	1.5
+++ waf.spec	26 May 2008 08:03:06 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           waf
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python-based build system
 
 Group:          Development/Tools
@@ -10,6 +10,7 @@
 Source0:        http://waf.googlecode.com/files/waf-%{version}.tar.bz2
 # use _datadir instead of /usr/lib
 Patch0:         waf-1.4.2-libdir.patch
+Patch1:         waf-1.4.2-fcntl.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
@@ -33,6 +34,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .libdir
+%patch1 -p1 -b .fcntl
 
 
 %build
@@ -75,6 +77,9 @@
 
 
 %changelog
+* Mon May 26 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.4.2-2
+- Patch: stdout might not be a terminal.
+
 * Sat May 17 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.4.2-1
 - Update to 1.4.2.
 - Remove shebang lines from files in wafadmin after installation, not