]>
Commit | Line | Data |
---|---|---|
058f36af JB |
1 | diff -Nur poldek-0.18.1.orig/pkg.c poldek-0.18.1/pkg.c |
2 | --- poldek-0.18.1.orig/pkg.c Fri Oct 18 18:19:42 2002 | |
3 | +++ poldek-0.18.1/pkg.c Sun Nov 23 02:22:57 2003 | |
4 | @@ -699,8 +699,8 @@ | |
5 | if ((strcmp(capreq_name(cap), capreq_name(req))) != 0) | |
6 | return 0; | |
7 | ||
8 | - if (capreq_has_epoch(req)) { | |
9 | - if (!capreq_has_epoch(cap)) | |
10 | + if (capreq_has_epoch(req) || capreq_has_ver(req)) { | |
11 | + if (!(capreq_has_epoch(cap) || capreq_has_ver(cap))) | |
12 | return strict == 0; | |
13 | ||
14 | cmprc = capreq_epoch(cap) - capreq_epoch(req); | |
15 | @@ -743,18 +743,13 @@ | |
16 | if (!capreq_versioned(req)) | |
17 | return 1; | |
18 | ||
19 | - if (capreq_has_epoch(req) && pkg->epoch) { | |
a19fd084 | 20 | + if (capreq_has_epoch(req) && (pkg->epoch || pkg->ver)) { |
058f36af JB |
21 | cmprc = pkg->epoch - capreq_epoch(req); |
22 | if (cmprc != 0) | |
23 | return rel_match(cmprc, req); | |
24 | evr = 1; | |
25 | - | |
26 | - } else if (capreq_epoch(req) > 0) { | |
27 | - cmprc = 0; | |
28 | - evr = 1; | |
29 | } | |
30 | - | |
31 | - | |
32 | + | |
33 | if (capreq_has_ver(req)) { | |
34 | cmprc = rpmvercmp(pkg->ver, capreq_ver(req)); | |
35 | if (cmprc != 0) | |
36 | diff -Nur poldek-0.18.1.orig/pkgset.c poldek-0.18.1/pkgset.c | |
37 | --- poldek-0.18.1.orig/pkgset.c Thu Nov 14 19:21:42 2002 | |
38 | +++ poldek-0.18.1/pkgset.c Sun Nov 23 02:21:01 2003 | |
39 | @@ -815,7 +815,7 @@ | |
40 | { | |
41 | int rc = 1; | |
42 | ||
43 | - if (pdef->pkg->epoch && pkg->epoch != pdef->pkg->epoch) | |
a19fd084 | 44 | + if ((pdef->pkg->epoch /* || pdef->pkg->ver */) && pkg->epoch != pdef->pkg->epoch) |
058f36af JB |
45 | rc = 0; |
46 | ||
47 | if (rc && *pdef->pkg->ver) |