]>
Commit | Line | Data |
---|---|---|
a3809792 JR |
1 | Index: lib/depends.c |
2 | =================================================================== | |
3 | RCS file: /v/rpm/cvs/rpm/lib/depends.c,v | |
4 | retrieving revision 1.404 | |
5 | retrieving revision 1.405 | |
6 | diff -w -u -r1.404 -r1.405 | |
7 | --- lib/depends.c 3 Jul 2008 15:08:05 -0000 1.404 | |
8 | +++ lib/depends.c 17 Jul 2008 13:57:42 -0000 1.405 | |
9 | @@ -1462,6 +1462,8 @@ | |
10 | int terminate = 2; /* XXX terminate if rc >= terminate */ | |
11 | int rc; | |
12 | int ourrc = 0; | |
13 | + int dirname_deps; | |
14 | + int symlink_deps; | |
15 | ||
16 | requires = rpmdsInit(requires); | |
17 | if (requires != NULL) | |
18 | @@ -1537,6 +1539,8 @@ | |
19 | } | |
20 | } | |
21 | ||
22 | + dirname_deps = rpmExpandNumeric("%{?_check_dirname_deps}%{?!_check_dirname_deps:1}"); | |
23 | + if (dirname_deps) { | |
24 | dirnames = rpmdsInit(dirnames); | |
25 | if (dirnames != NULL) | |
26 | while (ourrc < terminate && rpmdsNext(dirnames) >= 0) { | |
27 | @@ -1577,7 +1581,10 @@ | |
28 | /*@switchbreak@*/ break; | |
29 | } | |
30 | } | |
31 | + } | |
32 | ||
33 | + symlink_deps = rpmExpandNumeric("%{?_check_symlink_deps}%{?!_check_symlink_deps:1}"); | |
34 | + if (symlink_deps) { | |
35 | linktos = rpmdsInit(linktos); | |
36 | if (linktos != NULL) | |
37 | while (ourrc < terminate && rpmdsNext(linktos) >= 0) { | |
38 | @@ -1595,6 +1602,7 @@ | |
39 | dscolor = rpmdsColor(linktos); | |
40 | if (tscolor && dscolor && !(tscolor & dscolor)) | |
41 | continue; | |
42 | + } | |
43 | ||
44 | rc = unsatisfiedDepend(ts, linktos, adding); | |
45 |