rpms/gutenprint/F-10 gutenprint-foomaticppdupdate, 1.2, 1.3 gutenprint.spec, 1.43, 1.44
Tim Waugh
twaugh at fedoraproject.org
Sat Jan 10 13:12:01 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/gutenprint/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23163
Modified Files:
gutenprint-foomaticppdupdate gutenprint.spec
Log Message:
* Sat Jan 10 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-3
- Don't use popen2 in the foomatic PPD update script.
Index: gutenprint-foomaticppdupdate
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-10/gutenprint-foomaticppdupdate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gutenprint-foomaticppdupdate 8 Jan 2009 16:19:44 -0000 1.2
+++ gutenprint-foomaticppdupdate 10 Jan 2009 13:11:30 -0000 1.3
@@ -25,7 +25,7 @@
import sys
import glob
import os
-import popen2
+import subprocess
import tempfile
import cups
@@ -38,15 +38,14 @@
dry_run = True
def generate_ppd (ppdfile, printer, driver):
- (r, w) = popen2.popen2 (["foomatic-ppdfile",
- "-p", printer,
- "-d", driver])
- w.close ()
- ppd = r.readlines ()
- r.close ()
+ p = subprocess.Popen (["foomatic-ppdfile", "-p", printer, "-d", driver],
+ stdin=file ("/dev/null"),
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ (ppd, stderr) = p.communicate ()
fname = ppdfile + ".tmp"
try:
- file(fname, "w").writelines (ppd)
+ file(fname, "w").write (ppd)
except IOError, e:
print e
raise
Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-10/gutenprint.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gutenprint.spec 8 Jan 2009 16:19:44 -0000 1.43
+++ gutenprint.spec 10 Jan 2009 13:11:30 -0000 1.44
@@ -4,7 +4,7 @@
Name: gutenprint
Summary: Printer Drivers Package.
Version: 5.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: System Environment/Base
URL: http://gimp-print.sourceforge.net/
Source0: http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -254,6 +254,9 @@
/bin/rm -f /var/cache/foomatic/*
%changelog
+* Sat Jan 10 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-3
+- Don't use popen2 in the foomatic PPD update script.
+
* Thu Jan 8 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-2
- Only run the foomatic PPD update script on update, and make sure the
script can deal with major version upgrades (bug #478328).
More information about the fedora-extras-commits
mailing list