Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qa-scripts:master commit in: /
Date: Thu, 28 Aug 2014 03:48:04
Message-Id: 1409197668.b37f1aec13985ec672e5eccd3447491fae202bcf.kensington@gentoo
1 commit: b37f1aec13985ec672e5eccd3447491fae202bcf
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 28 03:47:48 2014 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 28 03:47:48 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/qa-scripts.git;a=commit;h=b37f1aec
7
8 depcheck: use simple virtual resolution in suspect RDEPEND check too.
9
10 ---
11 depcheck | 10 ++++++++++
12 1 file changed, 10 insertions(+)
13
14 diff --git a/depcheck b/depcheck
15 index 549fe52..e715e81 100755
16 --- a/depcheck
17 +++ b/depcheck
18 @@ -59,6 +59,7 @@ check_atom() {
19 local atom=$1
20 local checked=()
21 local rdepends=()
22 + local used_virtuals=()
23
24 local objects=`qlist -qo ${atom}`
25
26 @@ -154,6 +155,7 @@ check_atom() {
27 local isvirtualdep=$(qdepends -r ${atom} | grep ${virtual})
28
29 if [ $? -eq 0 ]; then
30 + used_virtuals+=( ${virtual} )
31 continue 2
32 fi
33 done
34 @@ -176,6 +178,14 @@ check_atom() {
35 if [[ ${rdepend} = !* ]] ; then
36 debug Skipping blocker: ${rdepend}
37 continue
38 + elif [[ ${rdepend} = virtual/* ]] ; then
39 + for virtual in "${used_virtuals[@]}"
40 + do
41 + if [[ ${virtual} == $(remove_atom_version ${rdepend}) ]]; then
42 + debug Skipping virtual: ${rdepend}
43 + continue 2
44 + fi
45 + done
46 fi
47 ebuild_rdepends+=( $(remove_atom_version $rdepend) )
48 done