rpms/rhpxl/F-8 rhpxl-print.patch,NONE,1.1 rhpxl.spec,1.61,1.62

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/rpms/rhpxl/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25363

Modified Files:
	rhpxl.spec 
Added Files:
	rhpxl-print.patch 
Log Message:
* Thu Nov  1 2007 Jeremy Katz <katzj at redhat.com> - 0.49-1
- Workaround for crasher when starting firstboot (#362721)


rhpxl-print.patch:

--- NEW FILE rhpxl-print.patch ---
diff -up rhpxl-0.49/rhpxl/xserver.py.print rhpxl-0.49/rhpxl/xserver.py
--- rhpxl-0.49/rhpxl/xserver.py.print	2007-11-01 20:19:26.000000000 -0400
+++ rhpxl-0.49/rhpxl/xserver.py	2007-11-01 20:20:03.000000000 -0400
@@ -184,17 +184,16 @@ class XServer:
             proc = subprocess.Popen(["/usr/bin/Xorg"] + args, preexec_fn=chroot,
                                     stdout=noOutput, stderr=noOutput)
 
-            sys.stdout.write(_("Waiting for X server to start...log located in %s\n") % self.logfile)
-            sys.stdout.flush()
+            print(_("Waiting for X server to start...log located in %s") % self.logfile)
 
             for i in range(5):
                 time.sleep(1)
-                sys.stdout.write("%s..." % (i+1))
-                sys.stdout.flush()
+                print ("%s..." % (i+1)),
 
                 # If the X process failed for some reason, raise an error now.
                 if proc.poll() is not None:
                     raise OSError
+            print
         except OSError:
             sys.stderr.write("X SERVER FAILED\n");
             raise RuntimeError, "X server failed to start"


Index: rhpxl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhpxl/F-8/rhpxl.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- rhpxl.spec	6 Sep 2007 21:00:08 -0000	1.61
+++ rhpxl.spec	2 Nov 2007 01:06:48 -0000	1.62
@@ -4,8 +4,9 @@
 Name: rhpxl
 URL: http://fedoraproject.org/wiki/rhpxl
 Version: 0.49
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: http://ajax.fedoraproject.org/%{name}/%{name}-%{version}.tar.gz
+Patch0: rhpxl-print.patch
 License: GPLv2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 make %{?_smp_mflags}
@@ -41,6 +43,9 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Thu Nov  1 2007 Jeremy Katz <katzj at redhat.com> - 0.49-1
+- Workaround for crasher when starting firstboot (#362721)
+
 * Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.49-1
 - rhpxl 0.49.  Fixes domainful PPC machines, and avoids probing for serial
   mice since they make USB devices go boom.