]>
Commit | Line | Data |
---|---|---|
e2813137 PS |
1 | --- installer/poldek/capreq.c 2004/01/10 12:45:34 1.25.4.1 |
2 | +++ installer/poldek/capreq.c 2004/12/01 16:24:52 1.25.4.2 | |
3 | @@ -639,24 +639,22 @@ | |
4 | if (flag & RPMSENSE_EQUAL) | |
5 | cr->cr_relflags |= REL_EQ; | |
6 | ||
7 | - | |
8 | + if (crtype == CRTYPE_REQ) { | |
9 | #ifndef HAVE_RPM_EXTDEPS | |
10 | - if (flag & RPMSENSE_PREREQ) { | |
11 | - n_assert(crtype == CRTYPE_REQ); | |
12 | - cr->cr_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN; | |
13 | - } | |
14 | + if (flag & RPMSENSE_PREREQ) { | |
15 | + n_assert(crtype == CRTYPE_REQ); | |
16 | + cr->cr_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN; | |
17 | + } | |
18 | #else | |
19 | - if (isLegacyPreReq(flag)) { /* prepared by rpm < 4.0.2 */ | |
20 | - n_assert(crtype == CRTYPE_REQ); | |
21 | - cr->cr_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN; | |
22 | + if (isLegacyPreReq(flag)) { /* prepared by rpm < 4.0.2 */ | |
23 | + cr->cr_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN; | |
24 | ||
25 | - } else if (isInstallPreReq(flag)) { | |
26 | - n_assert(crtype == CRTYPE_REQ); | |
27 | - cr->cr_flags |= CAPREQ_PREREQ; | |
28 | + } else if (isInstallPreReq(flag)) { | |
29 | + cr->cr_flags |= CAPREQ_PREREQ; | |
30 | ||
31 | - } else if (isErasePreReq(flag)) { | |
32 | - n_assert(crtype == CRTYPE_REQ); | |
33 | - cr->cr_flags |= CAPREQ_PREREQ_UN; | |
34 | + } else if (isErasePreReq(flag)) { | |
35 | + cr->cr_flags |= CAPREQ_PREREQ_UN; | |
36 | + } | |
37 | } | |
38 | #endif /* HAVE_RPM_EXTDEPS */ | |
39 | } |