sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

package_manager.py: sort output of OpkgPkgsList().list 

Without explicit sorting, the output generated by OpkgPkgsList().list
follows the order of packages in /var/lib/opkg/status, which appears
to be "random". Add sorting to make OpkgPkgsList().list behaviour
consistent with that of RpmPkgsList().list.

(From OE-Core rev: f06fb68a07b82e4b8f25d5cdf556cf8893ddf208)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andre McCurdy 2015-10-01 17:22:01 -07:00 committed by Richard Purdie
parent 37c54af056
commit 8ee9a933a5
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meta/lib/oe/package_manager.py
View File

@ -434,24 +434,30 @@ class OpkgPkgsList(PkgsList):
(self.opkg_cmd, self.opkg_args)
try:
output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).strip()
# bb.note(cmd)
tmp_output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).strip()
except subprocess.CalledProcessError as e:
bb.fatal("Cannot get the installed packages list. Command '%s' "
"returned %d:\n%s" % (cmd, e.returncode, e.output))
if output and format == "file":
tmp_output = ""
for line in output.split('\n'):
output = list()
for line in tmp_output.split('\n'):
if len(line.strip()) == 0:
continue
if format == "file":
pkg, pkg_file, pkg_arch = line.split()
full_path = os.path.join(self.rootfs_dir, pkg_arch, pkg_file)
if os.path.exists(full_path):
tmp_output += "%s %s %s\n" % (pkg, full_path, pkg_arch)
output.append('%s %s %s' % (pkg, full_path, pkg_arch))
else:
tmp_output += "%s %s %s\n" % (pkg, pkg_file, pkg_arch)
output.append('%s %s %s' % (pkg, pkg_file, pkg_arch))
else:
output.append(line)
output = tmp_output
output.sort()
return output
return '\n'.join(output)
class DpkgPkgsList(PkgsList):