author | Rich Burridge <rich.burridge@oracle.com> |
Sat, 09 May 2015 12:45:23 -0700 | |
changeset 4266 | bcfdeff915c4 |
parent 3831 | 33bc4f8fb536 |
child 4923 | b9e3f6b6a101 |
permissions | -rw-r--r-- |
3831
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
1 |
Home brewed patch |
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
2 |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
3 |
--- a/base/utils.py 2014-06-02 23:33:10.000000000 -0700 |
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
4 |
+++ hplip-3.14.6/base/utils.py 2014-07-01 13:44:00.526366599 -0700 |
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
5 |
@@ -2214,7 +2214,7 @@ |
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
6 |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
7 |
try: |
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
8 |
process = {} |
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
9 |
- p1 = Popen(["ps", "-w", "-w", "aux"], stdout=PIPE) |
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
10 |
+ p1 = Popen(["ps", "-ef"], stdout=PIPE) |
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
11 |
p2 = Popen(["grep", process_name], stdin=p1.stdout, stdout=PIPE) |
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
12 |
p3 = Popen(["grep", "-v", "grep"], stdin=p2.stdout, stdout=PIPE) |
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
13 |
output = p3.communicate()[0] |