diff options
| author | jbj <devnull@localhost> | 2001-04-23 20:56:59 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2001-04-23 20:56:59 +0000 |
| commit | a71985e5be5051164d089b1424130d0f303ff3c0 (patch) | |
| tree | c048803a0a540b554bc9b4a5c9b46ff4359c5a01 /lib | |
| parent | 1aaf1b9b5d3777a36f9cfff600912a7f468dc732 (diff) | |
| download | librpm-tizen-a71985e5be5051164d089b1424130d0f303ff3c0.tar.gz librpm-tizen-a71985e5be5051164d089b1424130d0f303ff3c0.tar.bz2 librpm-tizen-a71985e5be5051164d089b1424130d0f303ff3c0.zip | |
- regenerate rpm.8 man page from docbook glop (in max-rpm).
- lib/depends.c: diddle debugging messages.
CVS patchset: 4703
CVS date: 2001/04/23 20:56:59
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/depends.c | 10 | ||||
| -rw-r--r-- | lib/rpminstall.c | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/lib/depends.c b/lib/depends.c index 3371338c6..5975ee763 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -1728,7 +1728,7 @@ int rpmdepOrder(rpmTransactionSet ts) } /* T4. Scan for zeroes. */ - rpmMessage(RPMMESS_DEBUG, _("========== tsorting packages\n")); + rpmMessage(RPMMESS_DEBUG, _("========== tsorting packages (order, #predecessors, #succesors, depth)\n")); rescan: q = r = NULL; @@ -1943,6 +1943,8 @@ int rpmdepCheck(rpmTransactionSet ts, for (i = 0, p = ts->addedPackages.list; i < npkgs; i++, p++) { + rpmMessage(RPMMESS_DEBUG, ("========== +++ %s-%s-%s\n"), + p->name, p->version, p->release); rc = checkPackageDeps(ts, &ps, p->h, NULL, p->multiLib); if (rc) goto exit; @@ -1975,8 +1977,10 @@ int rpmdepCheck(rpmTransactionSet ts, rpmdbAppendIterator(mi, ts->removedPackages, ts->numRemovedPackages); while ((h = rpmdbNextIterator(mi)) != NULL) { - { const char * name; - headerNVR(h, &name, NULL, NULL); + { const char * name, * version, * release; + headerNVR(h, &name, &version, &release); + rpmMessage(RPMMESS_DEBUG, ("========== --- %s-%s-%s\n"), + name, version, release); /* Erasing: check name against requiredby matches. */ rc = checkDependentPackages(ts, &ps, name); diff --git a/lib/rpminstall.c b/lib/rpminstall.c index db7e52960..0862e87f4 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -331,8 +331,9 @@ restart: continue; } if ((rpmrc == RPMRC_OK || rpmrc == RPMRC_BADSIZE) && isSource) { - rpmMessage(RPMMESS_DEBUG, "\tadded source rpm[%d]\n", numSRPMS); - sourceURL = (sourceURL == NULL) + rpmMessage(RPMMESS_DEBUG, "\tadded source package [%d]\n", + numSRPMS); + sourceURL = (sourceURL == NULL) ? xmalloc( (numSRPMS + 2) * sizeof(*sourceURL)) : xrealloc(sourceURL, (numSRPMS + 2) * sizeof(*sourceURL)); sourceURL[numSRPMS++] = *fnp; @@ -413,7 +414,8 @@ restart: switch(rc) { case 0: - rpmMessage(RPMMESS_DEBUG, "\tadded binary rpm[%d]\n", numRPMS); + rpmMessage(RPMMESS_DEBUG, "\tadded binary package [%d]\n", + numRPMS); break; case 1: rpmMessage(RPMMESS_ERROR, |