| author | pkidd <patrick.kidd@oracle.com> |
| Wed, 11 Jan 2017 11:03:56 -0800 | |
| branch | s11u3-sru |
| changeset 7559 | 6e01bd7c2e39 |
| parent 5296 | fe5e30c5a9ac |
| permissions | -rw-r--r-- |
|
5296
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
1 |
source: in-house |
|
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
2 |
"de-linuxize" the ps args |
|
3935
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
3 |
|
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
4 |
--- a/base/utils.py 2014-06-02 23:33:10.000000000 -0700 |
|
5296
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
5 |
+++ b/base/utils.py 2014-07-01 13:44:00.526366599 -0700 |
|
3935
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
6 |
@@ -2214,7 +2214,7 @@ |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
7 |
|
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
8 |
try: |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
9 |
process = {}
|
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
10 |
- p1 = Popen(["ps", "-w", "-w", "aux"], stdout=PIPE) |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
11 |
+ p1 = Popen(["ps", "-ef"], stdout=PIPE) |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
12 |
p2 = Popen(["grep", process_name], stdin=p1.stdout, stdout=PIPE) |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
13 |
p3 = Popen(["grep", "-v", "grep"], stdin=p2.stdout, stdout=PIPE) |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
14 |
output = p3.communicate()[0] |