Commit c2487606f0167d060fa2e04623114062b4503014 - debian-goodies

which-pkg-broke: Multiple performance optimizations Use dpkg --print-architecture and dpkg --print-foreign-architectures instead of dpkg-architecture. This also fixes a missing dependency on dpkg-dev (which contains dpkg-architecture). Don't read architecture list again for each package to check. which-pkg-broke is much faster now. Thanks to Jakub Wilk for the idea! Closes: #665880 Axel Beckert 10 years ago

2 changed file(s) with 30 addition(s) and 8 deletion(s). Raw diff Collapse all Expand all

-0

debian/changelog less more

10	10	* [check-enhancements]
11	11	- New command by George Danchev (Closes: #679927)
12	12	- Add build-dependency on help2man for check-enhancements' man page
	13	* [which-pkg-broke]
	14	- Use 2x dpkg instead of dpkg-architecture (Closes: #665880)
	15	- Don't read architecture list again for each package to check (much
	16	faster now, thanks to Jakub Wilk for the idea!)
13	17	* Bump debhelper compatibility to 9 to be able to use some more recent
14	18	features. Update versioned debhelper build-dependency accordingly.
15	19	* Revamp debian/rules

+26

-8

which-pkg-broke less more

42	42	dlist = deps.keys()
43	43	return dlist
44	44
45		def pkginstalltime(pkg):
46		dpkg_archs = subprocess.Popen(
47		['dpkg-architecture', '-L'],
	45
	46	def localarchitectures():
	47	architectures = []
	48	dpkg_arch = subprocess.Popen(
	49	['dpkg', '--print-architecture'],
48	50	stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
49	51	env={} # force POSIX locale
50	52	)
	53	for arch in dpkg_arch.stdout.readlines():
	54	architectures.append(arch.rstrip())
51	55
52		arch = dpkg_archs.stdout.readline().rstrip()
	56	try:
	57	dpkg_archs = subprocess.Popen(
	58	['dpkg', '--print-foreign-architecture'],
	59	stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
	60	env={} # force POSIX locale
	61	)
	62	for arch in dpkg_archs.stdout.readlines():
	63	architectures.append(arch.rstrip())
	64
	65	except OSError:
	66	pass # non-multiarchy dpkg, which is ok
	67
	68	return architectures
	69
	70	def pkginstalltime(pkg, architectures):
53	71	times = []
54		while(arch != ''):
	72	for arch in architectures:
55	73	listfile = '/var/lib/dpkg/info/' + pkg + ':' + arch + '.list'
56	74	try:
57	75	times.append([pkg + ':' + arch, os.stat(listfile)[ST_MTIME]])
58	76	except OSError:
59	77	pass
60		arch = dpkg_archs.stdout.readline().rstrip()
61		dpkg_archs.wait()
62	78
63	79	if not times:
64	80	listfile = '/var/lib/dpkg/info/' + pkg + '.list'

76	92	pkgs = [ pname ]
77	93	pkgs.extend(alldeps(sys.argv[1], {}))
78	94
	95	architectures = localarchitectures()
	96
79	97	itimes = []
80	98	for p in pkgs:
81		itimes.extend(pkginstalltime(p))
	99	itimes.extend(pkginstalltime(p, architectures))
82	100	itimes.sort(sortfun)
83	101	for i in itimes:
84	102	p, t = i