Nemcio/opkg-utils
1
0
Fork 0
mirror of https://git.yoctoproject.org/git/opkg-utils synced 2026-05-07 11:25:30 +02:00
Code Issues Packages Projects Releases Activity

opkg-make-index: don't use stdout for Packages output and use __str__ instead of __repr__

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2012-03-29 16:40:49 +02:00
committed by Richard Purdie
parent 554da94178
commit b9eec00a67
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
opkg-make-index
View File

@@ -148,9 +148,8 @@ if opt_s:
if verbose: if verbose:
sys.stderr.write("Generating Packages file\n") sys.stderr.write("Generating Packages file\n")
if packages_filename: if packages_filename:
old_stdout = sys.stdout
tmp_packages_filename = ("%s.%d" % (packages_filename, os.getpid())) tmp_packages_filename = ("%s.%d" % (packages_filename, os.getpid()))
sys.stdout = open(tmp_packages_filename, "w") pkgsFile = open(tmp_packages_filename, "w")
names = list(packages.packages.keys()) names = list(packages.packages.keys())
names.sort() names.sort()
for name in names: for name in names:
@@ -171,7 +170,10 @@ for name in names:
continue continue
if (verbose): if (verbose):
sys.stderr.write("Writing info for package %s\n" % (pkg.package,)) sys.stderr.write("Writing info for package %s\n" % (pkg.package,))
print(pkg) if packages_filename:
pkgsFile.write(str(pkg))
else:
print(pkg)
except OSError as e: except OSError as e:
sys.stderr.write("Package %s disappeared on us!\n(%s)\n" % (name, e)) sys.stderr.write("Package %s disappeared on us!\n(%s)\n" % (name, e))
continue continue
@@ -180,8 +182,7 @@ for name in names:
continue continue
if packages_filename: if packages_filename:
sys.stdout.close() pkgsFile.close()
sys.stdout = old_stdout
gzip_filename = ("%s.gz" % packages_filename) gzip_filename = ("%s.gz" % packages_filename)
tmp_gzip_filename = ("%s.%d" % (gzip_filename, os.getpid())) tmp_gzip_filename = ("%s.%d" % (gzip_filename, os.getpid()))
gzip_cmd = "gzip -9c < %s > %s" % (tmp_packages_filename, tmp_gzip_filename) gzip_cmd = "gzip -9c < %s > %s" % (tmp_packages_filename, tmp_gzip_filename)
@@ -211,12 +212,12 @@ for name in names:
if filelist_filename: if filelist_filename:
tmp_filelist_filename = ("%s.%d" % (filelist_filename, os.getpid())) tmp_filelist_filename = ("%s.%d" % (filelist_filename, os.getpid()))
sys.stdout = open(tmp_filelist_filename, "w") f = open(tmp_filelist_filename, "w")
names = list(files.keys()) names = list(files.keys())
names.sort() names.sort()
for name in names: for name in names:
print((name,files[name])) f.write("%s %s\n" % (name, files[name]))
sys.stdout.close() f.close()
if posixpath.exists(filelist_filename): if posixpath.exists(filelist_filename):
os.unlink(filelist_filename) os.unlink(filelist_filename)
os.rename(tmp_filelist_filename, filelist_filename) os.rename(tmp_filelist_filename, filelist_filename)

4
opkg.py
View File

@@ -402,7 +402,7 @@ class Package:
ref.parsed_version = parse_version(ref.version) ref.parsed_version = parse_version(ref.version)
return self.parsed_version.compare(ref.parsed_version) return self.parsed_version.compare(ref.parsed_version)
def __repr__(self): def __str__(self):
out = "" out = ""
# XXX - Some checks need to be made, and some exceptions # XXX - Some checks need to be made, and some exceptions
@@ -506,7 +506,7 @@ if __name__ == "__main__":
package.set_description("A test of the APIs.") package.set_description("A test of the APIs.")
print("<") print("<")
sys.stdout.write(package) sys.stdout.write(str(package))
print(">") print(">")
package.write_package("/tmp") package.write_package("/tmp")