1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 29 Mar 2012 13:28:01 +0200
Subject: [PATCH] 2to3: use subprocess instead of commands
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
opkg-compare-indexes | 6 +++---
opkg-make-index | 5 ++---
opkg-show-deps | 1 -
opkg-update-index | 1 -
opkg.py | 2 +-
5 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/opkg-compare-indexes b/opkg-compare-indexes
index 6c68125..2610987 100755
--- a/opkg-compare-indexes
+++ b/opkg-compare-indexes
@@ -2,7 +2,7 @@
import sys, os
from glob import glob
-import commands
+import subprocess
import opkg
pkg_dir1 = sys.argv[1]
@@ -40,8 +40,8 @@ for name in names:
if pkg1 and pkg2 and pkg1.version != pkg2.version:
print "CHANGED: %s from version %s to %s (%s)" % (pkg1.package, pkg1.version, pkg2.version, pkg2.maintainer)
cmd = "opkg-diff %s %s > %s " % ((pkg_dir1 + pkg1.filename), (pkg_dir2 + pkg2.filename), (pkg1.package + '.diff'))
- print cmd
- commands.getstatusoutput(cmd)
+ print(cmd)
+ subprocess.call(cmd)
if not pkg1:
print "NEW: %s version %s (%s)"% (pkg2.package, pkg2.version, pkg2.maintainer)
if not pkg2:
diff --git a/opkg-make-index b/opkg-make-index
index b65dc6e..7923f1e 100755
--- a/opkg-make-index
+++ b/opkg-make-index
@@ -2,7 +2,7 @@
import sys, os, posixpath
from glob import glob
-import commands
+import subprocess
import opkg
import getopt
import string
@@ -186,8 +186,7 @@ if packages_filename:
gzip_filename = ("%s.gz" % packages_filename)
tmp_gzip_filename = ("%s.%d" % (gzip_filename, os.getpid()))
gzip_cmd = "gzip -9c < %s > %s" % (tmp_packages_filename, tmp_gzip_filename)
- (rc, outtext) = commands.getstatusoutput(gzip_cmd)
- print outtext
+ rc = subprocess.check_output(gzip_cmd, shell=True)
os.rename(tmp_packages_filename, packages_filename)
os.rename(tmp_gzip_filename, gzip_filename)
diff --git a/opkg-show-deps b/opkg-show-deps
index 9de1aac..5ab5b4f 100755
--- a/opkg-show-deps
+++ b/opkg-show-deps
@@ -2,7 +2,6 @@
import sys, os, posixpath
from glob import glob
-import commands
import opkg
import getopt
import string
diff --git a/opkg-update-index b/opkg-update-index
index 3864fa5..d9c9b43 100755
--- a/opkg-update-index
+++ b/opkg-update-index
@@ -2,7 +2,6 @@
import sys, os
from glob import glob
-import commands
import opkg
pkg_dir=sys.argv[1]
diff --git a/opkg.py b/opkg.py
index 31b847c..f37a68d 100644
--- a/opkg.py
+++ b/opkg.py
@@ -39,7 +39,7 @@ import glob
import hashlib
import re
import string
-import commands
+import subprocess
from stat import ST_SIZE
import arfile
import tarfile
|
