1 |
commit: 62961bdcb071b6e00418aabbbbfcb4601196ea42 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 24 17:27:42 2014 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 24 17:27:42 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/qa-scripts.git;a=commit;h=62961bdc |
7 |
|
8 |
depcheck: resolve an issue where missing RDEPEND is not reported. |
9 |
|
10 |
--- |
11 |
depcheck | 18 +++++++++++------- |
12 |
1 file changed, 11 insertions(+), 7 deletions(-) |
13 |
|
14 |
diff --git a/depcheck b/depcheck |
15 |
index 93abeb1..265615c 100755 |
16 |
--- a/depcheck |
17 |
+++ b/depcheck |
18 |
@@ -55,7 +55,7 @@ remove_atom_version() { |
19 |
|
20 |
virtualcheck() { |
21 |
debug Checking if ${libowner_pn} is provided by a virtual |
22 |
- for virtual in $(qdepends --nocolor --name-only --${1} --query ${libowner_pn} | grep ^virtual/) |
23 |
+ for virtual in $(qdepends --nocolor --name-only --rdepend --query ${libowner_pn} | grep ^virtual/) |
24 |
do |
25 |
debug Checking if ${virtual} is in dependencies |
26 |
local isvirtualdep |
27 |
@@ -63,16 +63,20 @@ virtualcheck() { |
28 |
|
29 |
if [ $? -eq 0 ]; then |
30 |
used_virtuals+=( ${virtual} ) |
31 |
- continue 2 |
32 |
+ local resolved=true |
33 |
+ break |
34 |
fi |
35 |
done |
36 |
|
37 |
- if [ "${1}" = "depend" ]; then |
38 |
- eerror "${obj} links to ${link}" |
39 |
+ if [[ ! ${resolved} ]]; then |
40 |
+ if [ "${1}" = "depend" ]; then |
41 |
+ eerror "${obj} links to ${link}" |
42 |
+ fi |
43 |
+ eindent |
44 |
+ eerror Missing ${1^^} on $(bold ${libowner_pn}) |
45 |
+ eoutdent |
46 |
fi |
47 |
- eindent |
48 |
- eerror Missing ${1^^} on $(bold ${libowner_pn}) |
49 |
- eoutdent |
50 |
+ |
51 |
errors=1 |
52 |
} |