projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| 358bccd1 JR |
1 | --- rpm-5.4.10/lib/query.c~ 2012-05-08 02:06:44.000000000 +0200 |
| 2 | +++ rpm-5.4.10/lib/query.c 2012-09-21 13:42:12.013607913 +0200 | |
| dda0825d JR |
3 | @@ -522,6 +522,10 @@ |
| 4 | case RPMQV_WHATCONFLICTS: | |
| 5 | case RPMQV_WHATOBSOLETES: | |
| 6 | qva->qva_mi = rpmtsInitIterator(ts, (rpmTag) qva->qva_source, arg, 0); | |
| 7 | +#if defined(RPM_VENDOR_PLD) | |
| 8 | + if(rpmmiCount(qva->qva_mi) == 0) | |
| 9 | + qva->qva_mi = rpmmiFree(qva->qva_mi); | |
| 10 | +#endif | |
| 11 | if (qva->qva_mi == NULL) { | |
| 12 | rpmlog(RPMLOG_NOTICE, _("key \"%s\" not found in %s table\n"), | |
| 13 | arg, tagName((rpmTag)qva->qva_source)); | |
| 14 | @@ -593,6 +597,10 @@ | |
| 15 | tag = (qva->qva_source == RPMQV_PKGID | |
| 16 | ? RPMTAG_SOURCEPKGID : RPMTAG_PKGID); | |
| 2d012bd7 | 17 | qva->qva_mi = rpmtsInitIterator(ts, (rpmTag) tag, MD5, MD5len); |
| dda0825d JR |
18 | +#if defined(RPM_VENDOR_PLD) |
| 19 | + if(rpmmiCount(qva->qva_mi) == 0) | |
| 20 | + qva->qva_mi = rpmmiFree(qva->qva_mi); | |
| 21 | +#endif | |
| 22 | if (qva->qva_mi == NULL) { | |
| 23 | rpmlog(RPMLOG_NOTICE, _("no package matches %s: %s\n"), | |
| 24 | "pkgid", arg); | |
| 25 | @@ -610,6 +618,10 @@ | |
| 26 | } | |
| 27 | ||
| 28 | qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_SHA1HEADER, arg, 0); | |
| 29 | +#if defined(RPM_VENDOR_PLD) | |
| 30 | + if(rpmmiCount(qva->qva_mi) == 0) | |
| 31 | + qva->qva_mi = rpmmiFree(qva->qva_mi); | |
| 32 | +#endif | |
| 33 | if (qva->qva_mi == NULL) { | |
| 34 | rpmlog(RPMLOG_NOTICE, _("no package matches %s: %s\n"), | |
| 35 | "hdrid", arg); | |
| 36 | @@ -637,6 +649,10 @@ | |
| 37 | *t = (nibble(s[0]) << 4) | nibble(s[1]); | |
| 38 | ||
| 39 | qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_FILEDIGESTS, digest, dlen); | |
| 40 | +#if defined(RPM_VENDOR_PLD) | |
| 41 | + if(rpmmiCount(qva->qva_mi) == 0) | |
| 42 | + qva->qva_mi = rpmmiFree(qva->qva_mi); | |
| 43 | +#endif | |
| 44 | if (qva->qva_mi == NULL) { | |
| 45 | rpmlog(RPMLOG_NOTICE, _("no package matches %s: %s\n"), | |
| 46 | "fileid", arg); | |
| 47 | @@ -666,6 +682,10 @@ | |
| 48 | return 1; | |
| 49 | } | |
| 50 | qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_INSTALLTID, &iid, sizeof(iid)); | |
| 51 | +#if defined(RPM_VENDOR_PLD) | |
| 52 | + if(rpmmiCount(qva->qva_mi) == 0) | |
| 53 | + qva->qva_mi = rpmmiFree(qva->qva_mi); | |
| 54 | +#endif | |
| 55 | if (qva->qva_mi == NULL) { | |
| 56 | rpmlog(RPMLOG_NOTICE, _("no package matches %s: %s\n"), | |
| 57 | "tid", arg); | |
| 58 | @@ -677,6 +697,10 @@ | |
| 59 | case RPMQV_WHATNEEDS: | |
| 60 | case RPMQV_WHATREQUIRES: | |
| 61 | qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_REQUIRENAME, arg, 0); | |
| 62 | +#if defined(RPM_VENDOR_PLD) | |
| 63 | + if(rpmmiCount(qva->qva_mi) == 0) | |
| 64 | + qva->qva_mi = rpmmiFree(qva->qva_mi); | |
| 65 | +#endif | |
| 66 | if (qva->qva_mi == NULL) { | |
| 67 | rpmlog(RPMLOG_NOTICE, _("no package requires %s\n"), arg); | |
| 68 | res = 1; | |
| 69 | @@ -688,6 +712,10 @@ | |
| 70 | if (arg[0] != '/') { | |
| 71 | provides_checked = 1; | |
| 72 | qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, arg, 0); | |
| 73 | +#if defined(RPM_VENDOR_PLD) | |
| 74 | + if(rpmmiCount(qva->qva_mi) == 0) | |
| 75 | + qva->qva_mi = rpmmiFree(qva->qva_mi); | |
| 76 | +#endif | |
| 77 | if (qva->qva_mi == NULL) { | |
| 78 | rpmlog(RPMLOG_NOTICE, _("no package provides %s\n"), arg); | |
| 79 | res = 1; | |
| 358bccd1 JR |
80 | @@ -732,7 +732,7 @@ |
| 81 | qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_FILEPATHS, fn, 0); | |
| 82 | if (qva->qva_mi == NULL && !provides_checked && !gotpattern) { | |
| 83 | qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, fn, 0); | |
| 84 | -#if defined(RPM_VENDOR_MANDRIVA) | |
| 85 | +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD) | |
| 86 | if(rpmmiCount(qva->qva_mi) == 0) | |
| 87 | qva->qva_mi = rpmmiFree(qva->qva_mi); | |
| 88 | #endif | |
| dda0825d JR |
89 | @@ -774,6 +802,10 @@ |
| 90 | } | |
| 91 | rpmlog(RPMLOG_DEBUG, D_("package record number: %u\n"), (unsigned)hdrNum); | |
| 92 | qva->qva_mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, &hdrNum, sizeof(hdrNum)); | |
| 93 | +#if defined(RPM_VENDOR_PLD) | |
| 94 | + if(rpmmiCount(qva->qva_mi) == 0) | |
| 95 | + qva->qva_mi = rpmmiFree(qva->qva_mi); | |
| 96 | +#endif | |
| 97 | if (qva->qva_mi == NULL) { | |
| 98 | rpmlog(RPMLOG_NOTICE, | |
| 99 | _("record %u could not be read\n"), (unsigned)hdrNum); |