diff options
| author | jbj <devnull@localhost> | 2002-06-05 20:26:57 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2002-06-05 20:26:57 +0000 |
| commit | 2395582ab025e75aae8f51c8787d34c5c961f88c (patch) | |
| tree | 402d3b104849336f2f2bf21973d71a757c97a906 /lib | |
| parent | 14d95f25f736587e23b5aa8a2302eb5f3b168df9 (diff) | |
| download | librpm-tizen-2395582ab025e75aae8f51c8787d34c5c961f88c.tar.gz librpm-tizen-2395582ab025e75aae8f51c8787d34c5c961f88c.tar.bz2 librpm-tizen-2395582ab025e75aae8f51c8787d34c5c961f88c.zip | |
- python: portability fiddles (#54350).
- check inodes (but not blocks) on FAT file systems (#64256).
CVS patchset: 5465
CVS date: 2002/06/05 20:26:57
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rpmps.c | 2 | ||||
| -rw-r--r-- | lib/rpmts.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/rpmps.c b/lib/rpmps.c index 75b5cd910..f73690c5c 100644 --- a/lib/rpmps.c +++ b/lib/rpmps.c @@ -247,7 +247,7 @@ const char * rpmProblemString(const rpmProblem prob) break; case RPMPROB_DISKSPACE: rc = snprintf(buf, nb, - _("installing package %s needs %ld%cb on the %s filesystem"), + _("installing package %s needs %ld%cB on the %s filesystem"), pkgNEVR, prob->ulong1 > (1024*1024) ? (prob->ulong1 + 1024 * 1024 - 1) / (1024 * 1024) diff --git a/lib/rpmts.c b/lib/rpmts.c index 881cc0e3e..1a4e6bf4d 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -296,6 +296,7 @@ int rpmtsAvailable(rpmts ts, const rpmds ds) sugkey = rpmalAllSatisfiesDepend(ts->availablePackages, ds, NULL); if (sugkey == NULL) return rc; + /* XXX no alternatives yet */ if (sugkey[0] != NULL) { ts->suggests = xrealloc(ts->suggests, @@ -681,11 +682,8 @@ void rpmtsCheckDSIProblems(const rpmts ts, const rpmte te) ps = rpmtsProblems(ts); for (i = 0; i < ts->filesystemCount; i++, dsi++) { - /* XXX Avoid FAT and other file systems that have not inodes. */ - if (dsi->iavail <= 0) - continue; - - if (adj_fs_blocks(dsi->bneeded) > dsi->bavail) { + /* XXX Avoid FAT and other file systems that have nvailot inodes. */ + if (dsi->iavail > 0 && adj_fs_blocks(dsi->bneeded) > dsi->bavail) { rpmpsAppend(ps, RPMPROB_DISKSPACE, rpmteNEVR(te), rpmteKey(te), ts->filesystems[i], NULL, NULL, |